diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js index f3778f5f..c61b5284 100644 --- a/framework/assets/www/cordova.js +++ b/framework/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// 3.3.0-dev-c9de1bc +// 3.5.0-dev-ba3190d /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,8 +19,8 @@ under the License. */ ;(function() { -var CORDOVA_JS_BUILD_LABEL = '3.3.0-dev-c9de1bc'; -// file: lib/scripts/require.js +var CORDOVA_JS_BUILD_LABEL = '3.5.0-dev-ba3190d'; +// file: src/scripts/require.js /*jshint -W079 */ /*jshint -W020 */ @@ -34,7 +34,7 @@ var require, requireStack = [], // Map of module ID -> index into requireStack of modules currently being built. inProgressModules = {}, - SEPERATOR = "."; + SEPARATOR = "."; @@ -44,7 +44,7 @@ var require, var resultantId = id; //Its a relative path, so lop off the last portion and add the id (minus "./") if (id.charAt(0) === ".") { - resultantId = module.id.slice(0, module.id.lastIndexOf(SEPERATOR)) + SEPERATOR + id.slice(2); + resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2); } return require(resultantId); }; @@ -98,7 +98,7 @@ if (typeof module === "object" && typeof require === "function") { module.exports.define = define; } -// file: lib/cordova.js +// file: src/cordova.js define("cordova", function(require, exports, module) { @@ -316,7 +316,7 @@ module.exports = cordova; }); -// file: lib/android/android/nativeapiprovider.js +// file: src/android/android/nativeapiprovider.js define("cordova/android/nativeapiprovider", function(require, exports, module) { /** @@ -339,7 +339,7 @@ module.exports = { }); -// file: lib/android/android/promptbasednativeapi.js +// file: src/android/android/promptbasednativeapi.js define("cordova/android/promptbasednativeapi", function(require, exports, module) { /** @@ -361,7 +361,7 @@ module.exports = { }); -// file: lib/common/argscheck.js +// file: src/common/argscheck.js define("cordova/argscheck", function(require, exports, module) { var exec = require('cordova/exec'); @@ -427,7 +427,7 @@ moduleExports.enableChecks = true; }); -// file: lib/common/base64.js +// file: src/common/base64.js define("cordova/base64", function(require, exports, module) { var base64 = exports; @@ -483,7 +483,7 @@ function uint8ToBase64(rawData) { }); -// file: lib/common/builder.js +// file: src/common/builder.js define("cordova/builder", function(require, exports, module) { var utils = require('cordova/utils'); @@ -552,7 +552,7 @@ function include(parent, objects, clobber, merge) { include(result, obj.children, clobber, merge); } } catch(e) { - utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"'); + utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"'); } }); } @@ -596,7 +596,7 @@ exports.replaceHookForTesting = function() {}; }); -// file: lib/common/channel.js +// file: src/common/channel.js define("cordova/channel", function(require, exports, module) { var utils = require('cordova/utils'), @@ -837,7 +837,7 @@ module.exports = channel; }); -// file: lib/android/exec.js +// file: src/android/exec.js define("cordova/exec", function(require, exports, module) { /** @@ -1074,7 +1074,7 @@ module.exports = androidExec; }); -// file: lib/common/exec/proxy.js +// file: src/common/exec/proxy.js define("cordova/exec/proxy", function(require, exports, module) { @@ -1104,7 +1104,7 @@ module.exports = { }; }); -// file: lib/common/init.js +// file: src/common/init.js define("cordova/init", function(require, exports, module) { var channel = require('cordova/channel'); @@ -1218,7 +1218,7 @@ channel.join(function() { }); -// file: lib/common/modulemapper.js +// file: src/common/modulemapper.js define("cordova/modulemapper", function(require, exports, module) { var builder = require('cordova/builder'), @@ -1319,7 +1319,7 @@ exports.reset(); }); -// file: lib/android/platform.js +// file: src/android/platform.js define("cordova/platform", function(require, exports, module) { module.exports = { @@ -1360,7 +1360,7 @@ module.exports = { }); -// file: lib/android/plugin/android/app.js +// file: src/android/plugin/android/app.js define("cordova/plugin/android/app", function(require, exports, module) { var exec = require('cordova/exec'); @@ -1437,10 +1437,11 @@ module.exports = { }); -// file: lib/common/pluginloader.js +// file: src/common/pluginloader.js define("cordova/pluginloader", function(require, exports, module) { var modulemapper = require('cordova/modulemapper'); +var urlutil = require('cordova/urlutil'); // Helper function to inject a