Merge pull request #302 from andygup/v2.5.1

V2.5.1
Esri · Apr 7, 2015 · baa52f0 · baa52f0
2 parents 75a9a55 + 5e43ced
commit baa52f0
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # offline-editor-js - Changelog
 
+## Version 2.5.1 - April 7, 2015
+
+Closes #301 - OfflineFeaturesManager failed on _validateFeature during an attachment ADD operation.
+
 ## Version 2.5.0.2 - April 2, 2015
 
 Minor doc update. Clarification in OfflineFeaturesManager on requiring `mode` be set to `FeatureLayer.MODE_SNAPSHOT`.

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 @@
-/*! offline-editor-js - v2.5 - 2015-03-27
+/*! offline-editor-js - v2.5.1 - 2015-04-07
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([
@@ -790,7 +790,7 @@ define([
                                         if(result.operation == self._editStore.ADD){
                                             // If we are deleting a new feature that has not been added to the
                                             // server yet we need to delete it and its phantom graphic.
-                                            self._deleteTemporaryFeature(graphic,function(success){
+                                            layer._deleteTemporaryFeature(graphic,function(success){
                                                 if(success == false){
                                                     resolved = false;
                                                 }
@@ -1013,12 +1013,12 @@ define([
                                 }
                             })
                         }
-                        else if(result == false){
-                            callback(false, error);
-                        }
-                        else if(result == true){
+                        else if(result){
                             callback(true, null);
                         }
+                        else{
+                            callback(false, error);
+                        }
                     });
                 },
 

diff --git a/dist/offline-tiles-advanced-src.js b/dist/offline-tiles-advanced-src.js
@@ -1,4 +1,4 @@
-/*! offline-editor-js - v2.5 - 2015-03-27
+/*! offline-editor-js - v2.5.1 - 2015-04-07
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

diff --git a/dist/offline-tiles-basic-src.js b/dist/offline-tiles-basic-src.js
@@ -1,4 +1,4 @@
-/*! offline-editor-js - v2.5 - 2015-03-27
+/*! offline-editor-js - v2.5.1 - 2015-04-07
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

diff --git a/dist/offline-tpk-src.js b/dist/offline-tpk-src.js
@@ -1,4 +1,4 @@
-/*! offline-editor-js - v2.5 - 2015-03-27
+/*! offline-editor-js - v2.5.1 - 2015-04-07
 *   Copyright (c) 2015 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 /**

diff --git a/lib/edit/offlineFeaturesManager.js b/lib/edit/offlineFeaturesManager.js
@@ -787,7 +787,7 @@ define([
                                         if(result.operation == self._editStore.ADD){
                                             // If we are deleting a new feature that has not been added to the
                                             // server yet we need to delete it and its phantom graphic.
-                                            self._deleteTemporaryFeature(graphic,function(success){
+                                            layer._deleteTemporaryFeature(graphic,function(success){
                                                 if(success == false){
                                                     resolved = false;
                                                 }
@@ -1010,12 +1010,12 @@ define([
                                 }
                             })
                         }
-                        else if(result == false){
-                            callback(false, error);
-                        }
-                        else if(result == true){
+                        else if(result){
                             callback(true, null);
                         }
+                        else{
+                            callback(false, error);
+                        }
                     });
                 },
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "offline-editor-js",
-    "version": "2.5",
+    "version": "2.5.1",
     "description": "Lightweight set of libraries for working offline with map tiles and ArcGIS feature services",
     "author": "Andy Gup <[email protected]> (http://blog.andygup.net)",
     "license": "Apache 2",

diff --git a/samples/package.json b/samples/package.json
@@ -9,7 +9,7 @@
   "appHomePage": "appcache-features.html",
   "optimizedApiURL": "../samples/jsolib",
   "arcGISBaseURL": "http://js.arcgis.com/3.11",
-  "version": "2.5",
+  "version": "2.5.1",
   "private": true,
   "description": "manifest generator project",
   "repository": {

diff --git a/test/SpecRunner.offlineAttachments.html b/test/SpecRunner.offlineAttachments.html
@@ -40,7 +40,7 @@
 		"esri/layers/FeatureLayer", "esri/geometry", "esri/request",
 		"dojo/dom", "dojo/on", "dojo/query",
 		"dojo/dom-construct",
-        "../dist/offline-edit-min.js",
+        "../dist/offline-edit-src.js",
         "dojo/domReady!"],
 		function(Map, 
 			GraphicsLayer, Graphic, 
@@ -90,7 +90,11 @@
 				{
 					g_featureLayers.forEach(function(layer)
 					{
-						g_offlineFeaturesManager.extend(layer);
+						g_offlineFeaturesManager.extend(layer,function(success,message){
+							if(!success){
+								alert("There was a problem extending the layer: " + layer);
+							}
+						});
 					});		
 				}
 				catch(err)

diff --git a/test/spec/offlineAttachmentsSpec.js b/test/spec/offlineAttachmentsSpec.js
@@ -452,7 +452,7 @@ describe("Attachments", function()
 			});
 		});
 
-		it("go Online", function(done)
+		async.it("go Online", function(done)
 		{
 			expect(g_featureLayers[3].graphics.length).toBe(2);
 
@@ -477,8 +477,8 @@ describe("Attachments", function()
 				expect(attachmentResults[1].addAttachmentResult).not.toBeUndefined();
 				expect(attachmentResults[1].addAttachmentResult.success).toBeTruthy();
 
-				expect(result.features.responses[g_featureLayers[3].url]).not.toBeUndefined();
-				var featureResults = result.features.responses[g_featureLayers[3].url];
+				expect(result.features.responses[0]).not.toBeUndefined();
+				var featureResults = result.features.responses[0];
 				expect(featureResults.addResults.length).toBe(1);
 				expect(featureResults.updateResults.length).toBe(0);
 				expect(featureResults.deleteResults.length).toBe(0);
@@ -492,16 +492,17 @@ describe("Attachments", function()
 				{
 					expect(success).toBeTruthy();
 					expect(result.count).toBe(2);
-//			 		done();
+			 		done();
 			 	});
 			});
 			expect(g_offlineFeaturesManager.getOnlineStatus()).toBe(g_offlineFeaturesManager.RECONNECTING);
 		});
 
 		it("no edits pending", function(done)
 		{
-			expect(g_editsStore.pendingEditsCount()).toBe(0);
-//			done();
+			expect(g_featureLayers[3].pendingEditsCount(function(count){
+				expect(count).toBe(0);
+			}));
 		});
 
 		it("no attachments pending", function(done)