Merge pull request #401 from andygup/v2.14

v2.14
Esri · Aug 14, 2015 · 07bfc54 · 07bfc54
2 parents 5235be0 + 5143c63
commit 07bfc54
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,15 @@
 .DS_Store
 Icon
 
+# Filesystem
+*.zip
 
 # Node
 node_modules
 
 # Grunt
-.grunt/
+.grunt/
+
+# npm
+
+*.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # offline-editor-js - Changelog
 
+## Version 2.14 - Aug. 14, 2015
+
+No breaking changes. 
+
+**Enhancements**
+* Closes #399 - OfflineFeaturesManager now throws an error if you try to extend a layer before the map or layer has finished initializing.
+
+**Bug Fix**
+* Closes #400 - deferred already resolved error when going online.
+
 ## Version 2.13.1 - Aug. 12, 2015
 
 No breaking changes. 

diff --git a/dist/offline-edit-min.js b/dist/offline-edit-min.js
diff --git a/dist/offline-edit-src.js b/dist/offline-edit-src.js
@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v2.13.1 - 2015-08-12
+/*! esri-offline-maps - v2.14.0 - 2015-08-14
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 /*jshint -W030 */
@@ -114,6 +114,10 @@ define([
                     var self = this;
                     layer.offlineExtended = true; // to identify layer has been extended
 
+                    if(!layer.loaded || layer._url === null) {
+                        console.error("Make sure to initialize OfflineFeaturesManager after layer loaded and feature layer update-end event.");
+                    }
+
                     // NOTE: At v2.6.1 we've discovered that not all feature layers support objectIdField.
                     // However, to try to be consistent here with how the library is managing Ids
                     // we force the layer.objectIdField to DB_UID. This should be consistent with
@@ -1142,7 +1146,7 @@ define([
                             layer._map.addLayer(layer._phantomLayer);
                         }
                         catch (err) {
-                            console.log("Unable to init PhantomLayer");
+                            console.log("Unable to init PhantomLayer: " + err.message);
                         }
                     }
 
@@ -1905,8 +1909,8 @@ define([
                                     return r.objectId;
                                 });
 
-                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (success) {
-                                    console.log("done replacing feature ids");
+                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (count) {
+                                    console.log("Done replacing feature ids. Total count = " + count);
                                 });
                             }
 
@@ -1979,17 +1983,8 @@ define([
                                     return r.objectId;
                                 });
 
-                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (success) {
-
-                                    dfd.resolve({
-                                        id: id,
-                                        layer: layer.url,
-                                        tempId: tempObjectIds, // let's us internally match an ADD to it's new ObjectId
-                                        addResults: addResults,
-                                        updateResults: updateResults,
-                                        deleteResults: deleteResults,
-                                        syncError: null
-                                    });
+                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (count) {
+                                    console.log("Done replacing feature ids. Total count = " + count);
                                 });
                             }
 
@@ -3505,6 +3500,7 @@ O.esri.Edit.AttachmentsStore = function () {
                 cursor.continue();
             }
             else {
+                // If no records match then evt.target.result = null
                 // allow time for all changes to persist...
                 setTimeout(function () {
                     callback(replacedCount);

diff --git a/dist/offline-tiles-advanced-min.js b/dist/offline-tiles-advanced-min.js
diff --git a/dist/offline-tiles-advanced-src.js b/dist/offline-tiles-advanced-src.js
@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v2.13.1 - 2015-08-12
+/*! esri-offline-maps - v2.14.0 - 2015-08-14
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

diff --git a/dist/offline-tiles-basic-min.js b/dist/offline-tiles-basic-min.js
diff --git a/dist/offline-tiles-basic-src.js b/dist/offline-tiles-basic-src.js
@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v2.13.1 - 2015-08-12
+/*! esri-offline-maps - v2.14.0 - 2015-08-14
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

diff --git a/dist/offline-tpk-min.js b/dist/offline-tpk-min.js
diff --git a/dist/offline-tpk-src.js b/dist/offline-tpk-src.js
@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v2.13.1 - 2015-08-12
+/*! esri-offline-maps - v2.14.0 - 2015-08-14
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 /**

diff --git a/lib/edit/attachmentsStore.js b/lib/edit/attachmentsStore.js
@@ -267,6 +267,7 @@ O.esri.Edit.AttachmentsStore = function () {
                 cursor.continue();
             }
             else {
+                // If no records match then evt.target.result = null
                 // allow time for all changes to persist...
                 setTimeout(function () {
                     callback(replacedCount);

diff --git a/lib/edit/offlineFeaturesManager.js b/lib/edit/offlineFeaturesManager.js
@@ -111,6 +111,10 @@ define([
                     var self = this;
                     layer.offlineExtended = true; // to identify layer has been extended
 
+                    if(!layer.loaded || layer._url === null) {
+                        console.error("Make sure to initialize OfflineFeaturesManager after layer loaded and feature layer update-end event.");
+                    }
+
                     // NOTE: At v2.6.1 we've discovered that not all feature layers support objectIdField.
                     // However, to try to be consistent here with how the library is managing Ids
                     // we force the layer.objectIdField to DB_UID. This should be consistent with
@@ -1139,7 +1143,7 @@ define([
                             layer._map.addLayer(layer._phantomLayer);
                         }
                         catch (err) {
-                            console.log("Unable to init PhantomLayer");
+                            console.log("Unable to init PhantomLayer: " + err.message);
                         }
                     }
 
@@ -1902,8 +1906,8 @@ define([
                                     return r.objectId;
                                 });
 
-                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (success) {
-                                    console.log("done replacing feature ids");
+                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (count) {
+                                    console.log("Done replacing feature ids. Total count = " + count);
                                 });
                             }
 
@@ -1976,17 +1980,8 @@ define([
                                     return r.objectId;
                                 });
 
-                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (success) {
-
-                                    dfd.resolve({
-                                        id: id,
-                                        layer: layer.url,
-                                        tempId: tempObjectIds, // let's us internally match an ADD to it's new ObjectId
-                                        addResults: addResults,
-                                        updateResults: updateResults,
-                                        deleteResults: deleteResults,
-                                        syncError: null
-                                    });
+                                layer._replaceFeatureIds(tempObjectIds, newObjectIds, function (count) {
+                                    console.log("Done replacing feature ids. Total count = " + count);
                                 });
                             }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esri-offline-maps",
-  "version": "2.13.1",
+  "version": "2.14.0",
   "description": "Lightweight set of libraries for working offline with map tiles and editing with ArcGIS feature services",
   "author": "Andy Gup <agup@esri.com> (http://blog.andygup.net)",
   "license": "Apache 2.0",

diff --git a/test/SpecRunner.offlineFeaturesManager.html b/test/SpecRunner.offlineFeaturesManager.html
@@ -88,7 +88,12 @@
 
 			g_map.addLayers(g_featureLayers);
 
+			/////////////////////////////////////////////////////////////////////////
+			/////////////////////////////////////////////////////////////////////////
+			// To test what happens when you extend library before layers-add-result
+			// comment this out below and just run test()
 			g_map.on('layers-add-result', test);
+			//test()
 
 			function test(evt)
 			{