Skip to content

Commit

Permalink
Merge pull request #359 from andygup/update_tpk
Browse files Browse the repository at this point in the history
v2.9.3
  • Loading branch information
andygup committed Jul 1, 2015
2 parents ef66598 + 9cebf52 commit 3972d4a
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 22 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# offline-editor-js - Changelog

## Version 2.9.3 - July 1, 2015

No breaking changes.

**Enhancements**
* Closes #319. Make TPK support more universal between Chrome and WebView on Android.

## Version 2.9.2.2 - June 24, 2015

Minor doc update. Updates to README.
Expand Down
2 changes: 1 addition & 1 deletion dist/offline-edit-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/offline-edit-src.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! offline-editor-js - v2.9.2 - 2015-06-17
/*! offline-editor-js - v2.9.3 - 2015-07-01
* Copyright (c) 2015 Environmental Systems Research Institute, Inc.
* Apache License*/
/*jshint -W030 */
Expand Down
2 changes: 1 addition & 1 deletion dist/offline-tiles-advanced-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/offline-tiles-advanced-src.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! offline-editor-js - v2.9.2 - 2015-06-17
/*! offline-editor-js - v2.9.3 - 2015-07-01
* Copyright (c) 2015 Environmental Systems Research Institute, Inc.
* Apache License*/
define([
Expand Down
2 changes: 1 addition & 1 deletion dist/offline-tiles-basic-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/offline-tiles-basic-src.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! offline-editor-js - v2.9.2 - 2015-06-17
/*! offline-editor-js - v2.9.3 - 2015-07-01
* Copyright (c) 2015 Environmental Systems Research Institute, Inc.
* Apache License*/
define([
Expand Down
6 changes: 3 additions & 3 deletions dist/offline-tpk-min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/offline-tpk-src.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! offline-editor-js - v2.9.2 - 2015-06-17
/*! offline-editor-js - v2.9.3 - 2015-07-01
* Copyright (c) 2015 Environmental Systems Research Institute, Inc.
* Apache License*/
/**
Expand Down Expand Up @@ -374,17 +374,17 @@ define([
console.error("_unzipTileFiles Error: " + event.target.error.message);
that.emit(that.PARSING_ERROR, {msg: "Error parsing file: ", err: event.target.error});
}
reader.addEventListener("loadend", function (evt) {
if(this.token != undefined){
reader.onloadend = function(evt) {
if(reader.token != undefined){
that._inMemTilesIndex.push("blank");
var name = files[this.token].filename.toLocaleUpperCase();
that._inMemTilesObject[name]= this.result;
var name = files[reader.token].filename.toLocaleUpperCase();
that._inMemTilesObject[name]= reader.result;
var size = that.ObjectSize(that._inMemTilesObject);
if(size > 0){
callback(deferred,data.token);
}
}
});
};
reader.readAsArrayBuffer(data); //open bundleX
}
});
Expand Down
10 changes: 5 additions & 5 deletions lib/tpk/TPKLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,17 +371,17 @@ define([
console.error("_unzipTileFiles Error: " + event.target.error.message);
that.emit(that.PARSING_ERROR, {msg: "Error parsing file: ", err: event.target.error});
}
reader.addEventListener("loadend", function (evt) {
if(this.token != undefined){
reader.onloadend = function(evt) {
if(reader.token != undefined){
that._inMemTilesIndex.push("blank");
var name = files[this.token].filename.toLocaleUpperCase();
that._inMemTilesObject[name]= this.result;
var name = files[reader.token].filename.toLocaleUpperCase();
that._inMemTilesObject[name]= reader.result;
var size = that.ObjectSize(that._inMemTilesObject);
if(size > 0){
callback(deferred,data.token);
}
}
});
};
reader.readAsArrayBuffer(data); //open bundleX
}
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "offline-editor-js",
"version": "2.9.2",
"version": "2.9.3",
"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",
Expand Down
2 changes: 1 addition & 1 deletion samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"appHomePage": "appcache-features.html",
"optimizedApiURL": "../samples/jsolib",
"arcGISBaseURL": "http://js.arcgis.com/3.11",
"version": "2.9.2",
"version": "2.9.3",
"private": true,
"description": "manifest generator project",
"repository": {
Expand Down

0 comments on commit 3972d4a

Please sign in to comment.