Merge pull request #489 from andygup/v3.6

V3.6.0

CHANGELOG.md

@@ -1,5 +1,14 @@
 # offline-editor-js - Changelog
 
+## Version 3.6.0 - October 17, 2016
+
+No breaking changes.
+
+**Enhancements**
+* Closes #487 - missing libraries in offline-tpk-src.js
+* Closes #488 - fix package.json SPDX license expression. Pretty much only affects the latest versions of grunt-cli.
+
+
 ## Version 3.5.0 - September 15, 2016
 
 Possible breaking changes. Changes to database storage pattern.

Gruntfile.js

@@ -106,6 +106,8 @@ module.exports = function(grunt) {
                     'lib/tpk/TPKLayer.js',
                     'lib/tpk/OfflineTpkNS.js',
                     'lib/tiles/TilesStore.js',
+                    'lib/tiles/lzString.js',
+                    'lib/tiles/base64String.js',
                     'lib/tpk/zip.js',
                     'lib/tpk/autoCenterMap.js',
                     'lib/tpk/inflate.js',

dist/offline-edit-advanced-src.js

@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v3.5.0 - 2016-09-15
+/*! esri-offline-maps - v3.6.0 - 2016-10-17
 *   Copyright (c) 2016 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 // Configure offline/online detection

dist/offline-edit-basic-src.js

@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v3.5.0 - 2016-09-15
+/*! esri-offline-maps - v3.6.0 - 2016-10-17
 *   Copyright (c) 2016 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 // Configure offline/online detection

dist/offline-tiles-advanced-src.js

@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v3.5.0 - 2016-09-15
+/*! esri-offline-maps - v3.6.0 - 2016-10-17
 *   Copyright (c) 2016 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

dist/offline-tiles-basic-src.js

@@ -1,4 +1,4 @@
-/*! esri-offline-maps - v3.5.0 - 2016-09-15
+/*! esri-offline-maps - v3.6.0 - 2016-10-17
 *   Copyright (c) 2016 Environmental Systems Research Institute, Inc.
 *   Apache License*/
 define([

package.json

@@ -1,9 +1,9 @@
 {
   "name": "esri-offline-maps",
-  "version": "3.5.0",
+  "version": "3.6.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",
+  "license": "Apache-2.0",
   "main": "dist/offline-edit-min.js",
   "contributors": [
     "Javier Abadia",
@@ -26,8 +26,8 @@
   "homepage": "http://esri.github.io/offline-editor-js/demo/",
   "dependencies": {},
   "devDependencies": {
-    "grunt": "^0.4.5",
     "gh-release": "^2.0.0",
+    "grunt": "^0.4.5",
     "grunt-contrib-compress": "^0.13.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-jshint": "^0.11.1",

samples/package.json

@@ -9,7 +9,7 @@
   "appHomePage": "appcache-tiles.html",
   "optimizedApiURL": "../samples/jsolib",
   "arcGISBaseURL": "http://js.arcgis.com/3.14",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "private": true,
   "description": "manifest generator project",
   "repository": {

samples/tpk-layer.html

@@ -134,11 +134,13 @@
                     xhrRequest.open("GET", url.value, true);
                     xhrRequest.responseType = "blob";
                     xhrRequest.onprogress = function(evt){
-                        if(evt.hasOwnProperty("total")){
-                            var percent = (parseFloat(evt.loaded / evt.total) * 100).toFixed(0);
+                        var percent = 0;
+
+                        if("total" in evt){
+                            percent = (parseFloat(evt.loaded / evt.total) * 100).toFixed(0);
                         }
                         else{
-                            var percent = (parseFloat(evt.loaded / evt.totalSize) * 100).toFixed(0);
+                            percent = (parseFloat(evt.loaded / evt.totalSize) * 100).toFixed(0);
                         }
                         urlInputBtn.innerHTML = "Get file via url " + percent + "%";
                         console.log("Begin downloading remote tpk file...")

test/SpecRunner.TPKLayer.html

@@ -46,7 +46,7 @@
         var tpkLayer = null;
 
         require([
-                    "../dist/offline-tpk-min.js",
+                    "../dist/offline-tpk-src.js",
                     "dojo/domReady!"],
                 function()
                 {