Updated Branches: refs/heads/master 9facafb4f -> 5e8e2697e
Interim .js for the deleted 'Debug Console' plugin Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/5e8e2697 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/5e8e2697 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/5e8e2697 Branch: refs/heads/master Commit: 5e8e2697efb975d32d5cad7a3d05c676ef356805 Parents: 9facafb Author: Shazron Abdullah <[email protected]> Authored: Thu Apr 11 13:09:40 2013 -0700 Committer: Shazron Abdullah <[email protected]> Committed: Thu Apr 11 13:09:40 2013 -0700 ---------------------------------------------------------------------- CordovaLib/cordova.ios.js | 202 ++++++++++++++-------------------------- 1 files changed, 71 insertions(+), 131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5e8e2697/CordovaLib/cordova.ios.js ---------------------------------------------------------------------- diff --git a/CordovaLib/cordova.ios.js b/CordovaLib/cordova.ios.js index 4df7891..6e559cc 100644 --- a/CordovaLib/cordova.ios.js +++ b/CordovaLib/cordova.ios.js @@ -1,8 +1,8 @@ // Platform: ios -// commit 125dca530923a44a8f44f68f5e1970cbdd4e7faf +// commit 57816c7dce8a955f8a018ddef4077564510de3ad -// File generated at :: Thu Apr 04 2013 10:21:55 GMT-0700 (PDT) +// File generated at :: Thu Apr 11 2013 13:06:59 GMT-0700 (PDT) /* Licensed to the Apache Software Foundation (ASF) under one @@ -2372,7 +2372,7 @@ function initRead(reader, file) { if (typeof file == 'string') { // Deprecated in Cordova 2.4. - console.warning('Using a string argument with FileReader.readAs functions is deprecated.'); + console.warn('Using a string argument with FileReader.readAs functions is deprecated.'); reader._fileName = file; } else if (typeof file.fullPath == 'string') { reader._fileName = file.fullPath; @@ -2730,7 +2730,7 @@ function getBasicAuthHeader(urlString) { var origin = protocol + url.host; // check whether there are the username:password credentials in the url - if (url.href.indexOf(origin) != 0) { // credentials found + if (url.href.indexOf(origin) !== 0) { // credentials found var atIndex = url.href.indexOf("@"); credentials = url.href.substring(protocol.length, atIndex); } @@ -2779,15 +2779,11 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro var params = null; var chunkedMode = true; var headers = null; - + var httpMethod = null; var basicAuthHeader = getBasicAuthHeader(server); if (basicAuthHeader) { - if (!options) { - options = new FileUploadOptions(); - } - if (!options.headers) { - options.headers = {}; - } + options = options || {}; + options.headers = options.headers || {}; options.headers[basicAuthHeader.name] = basicAuthHeader.value; } @@ -2796,6 +2792,12 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro fileName = options.fileName; mimeType = options.mimeType; headers = options.headers; + httpMethod = options.httpMethod || "POST"; + if (httpMethod.toUpperCase() == "PUT"){ + httpMethod = "PUT"; + } else { + httpMethod = "POST"; + } if (options.chunkedMode !== null || typeof options.chunkedMode != "undefined") { chunkedMode = options.chunkedMode; } @@ -2822,7 +2824,7 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro successCallback && successCallback(result); } }; - exec(win, fail, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode, headers, this._id]); + exec(win, fail, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode, headers, this._id, httpMethod]); }; /** @@ -2840,12 +2842,8 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro var basicAuthHeader = getBasicAuthHeader(source); if (basicAuthHeader) { - if (!options) { - options = {}; - } - if (!options.headers) { - options.headers = {}; - } + options = options || {}; + options.headers = options.headers || {}; options.headers[basicAuthHeader.name] = basicAuthHeader.value; } @@ -2884,12 +2882,11 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro }; /** - * Aborts the ongoing file transfer on this object - * @param successCallback {Function} Callback to be invoked upon success - * @param errorCallback {Function} Callback to be invoked upon error + * Aborts the ongoing file transfer on this object. The original error + * callback for the file transfer will be called if necessary. */ -FileTransfer.prototype.abort = function(successCallback, errorCallback) { - exec(successCallback, errorCallback, 'FileTransfer', 'abort', [this._id]); +FileTransfer.prototype.abort = function() { + exec(null, null, 'FileTransfer', 'abort', [this._id]); }; module.exports = FileTransfer; @@ -2933,12 +2930,13 @@ define("cordova/plugin/FileUploadOptions", function(require, exports, module) { * @param headers {Object} Keys are header names, values are header values. Multiple * headers of the same name are not supported. */ -var FileUploadOptions = function(fileKey, fileName, mimeType, params, headers) { +var FileUploadOptions = function(fileKey, fileName, mimeType, params, headers, httpMethod) { this.fileKey = fileKey || null; this.fileName = fileName || null; this.mimeType = mimeType || null; this.params = params || null; this.headers = headers || null; + this.httpMethod = httpMethod || null; }; module.exports = FileUploadOptions; @@ -3273,6 +3271,7 @@ define("cordova/plugin/InAppBrowser", function(require, exports, module) { var exec = require('cordova/exec'); var channel = require('cordova/channel'); +var modulemapper = require('cordova/modulemapper'); function InAppBrowser() { this.channels = { @@ -3301,6 +3300,26 @@ InAppBrowser.prototype = { if (eventname in this.channels) { this.channels[eventname].unsubscribe(f); } + }, + + executeScript: function(injectDetails, cb) { + if (injectDetails.code) { + exec(cb, null, "InAppBrowser", "injectScriptCode", [injectDetails.code, !!cb]); + } else if (injectDetails.file) { + exec(cb, null, "InAppBrowser", "injectScriptFile", [injectDetails.file, !!cb]); + } else { + throw new Error('executeScript requires exactly one of code or file to be specified'); + } + }, + + insertCSS: function(injectDetails, cb) { + if (injectDetails.code) { + exec(cb, null, "InAppBrowser", "injectStyleCode", [injectDetails.code, !!cb]); + } else if (injectDetails.file) { + exec(cb, null, "InAppBrowser", "injectStyleFile", [injectDetails.file, !!cb]); + } else { + throw new Error('insertCSS requires exactly one of code or file to be specified'); + } } }; @@ -3309,6 +3328,13 @@ module.exports = function(strUrl, strWindowName, strWindowFeatures) { var cb = function(eventname) { iab._eventHandler(eventname); }; + + // Don't catch calls that write to existing frames (e.g. named iframes). + if (window.frames && window.frames[strWindowName]) { + var origOpenFunc = modulemapper.getOriginalSymbol(window, 'open'); + return origOpenFunc.apply(window, arguments); + } + exec(cb, cb, "InAppBrowser", "open", [strUrl, strWindowName, strWindowFeatures]); return iab; }; @@ -5257,93 +5283,6 @@ module.exports = { }); -// file: lib/ios/plugin/ios/console.js -define("cordova/plugin/ios/console", function(require, exports, module) { - -var exec = require('cordova/exec'); - -/** - * create a nice string for an object - */ -function stringify(message) { - try { - if (typeof message === "object" && JSON && JSON.stringify) { - try { - return JSON.stringify(message); - } - catch (e) { - return "error JSON.stringify()ing argument: " + e; - } - } else { - return (typeof message === "undefined") ? "undefined" : message.toString(); - } - } catch (e) { - return e.toString(); - } -} - -/** - * Wrapper one of the console logging methods, so that - * the Cordova logging native is called, then the original. - */ -function wrappedMethod(console, method) { - var origMethod = console[method]; - - return function() { - - var args = [].slice.call(arguments), - len = args.length, - i = 0, - res = []; - - for ( ; i < len; i++) { - res.push(stringify(args[i])); - } - - exec(null, null, - 'Debug Console', 'log', - [ res.join(' '), { logLevel: method.toUpperCase() } ] - ); - - if (!origMethod) return; - - origMethod.apply(console, arguments); - }; -} - -var console = window.console || {}; - -// 2012-10-06 pmuellr - marking setLevel() method and logLevel property -// on console as deprecated; -// it didn't do anything useful, since the level constants weren't accessible -// to anyone - -console.setLevel = function() {}; -console.logLevel = 0; - -// wrapper the logging messages - -var methods = ["log", "debug", "info", "warn", "error"]; - -for (var i=0; i<methods.length; i++) { - var method = methods[i]; - - console[method] = wrappedMethod(console, method); -} - -module.exports = console; - -}); - -// file: lib/ios/plugin/ios/console/symbols.js -define("cordova/plugin/ios/console/symbols", function(require, exports, module) { - -var modulemapper = require('cordova/modulemapper'); - -modulemapper.clobbers('cordova/plugin/ios/console', 'console'); - -}); - // file: lib/ios/plugin/ios/contacts.js define("cordova/plugin/ios/contacts", function(require, exports, module) { @@ -5421,6 +5360,16 @@ logger.useConsole(false); }); +// file: lib/ios/plugin/ios/logger/symbols.js +define("cordova/plugin/ios/logger/symbols", function(require, exports, module) { + + +var modulemapper = require('cordova/modulemapper'); + +modulemapper.clobbers('cordova/plugin/logger', 'console'); + +}); + // file: lib/ios/plugin/ios/notification.js define("cordova/plugin/ios/notification", function(require, exports, module) { @@ -6301,12 +6250,7 @@ window.cordova = require('cordova'); * Create all cordova objects once page has fully loaded and native side is ready. */ channel.join(function() { - var builder = require('cordova/builder'), - platform = require('cordova/platform'); - - builder.buildIntoButDoNotClobber(platform.defaults, context); - builder.buildIntoAndClobber(platform.clobbers, context); - builder.buildIntoAndMerge(platform.merges, context); + var platform = require('cordova/platform'); // Call the platform-specific initialization platform.initialize(); @@ -6399,31 +6343,27 @@ window.cordova = require('cordova'); } } + // Try to XHR the cordova_plugins.json file asynchronously. - try { // we commented we were going to try, so let us actually try and catch + try { // we commented we were going to try, so let us actually try and catch var xhr = new context.XMLHttpRequest(); - xhr.onreadystatechange = function() { - if (this.readyState != 4) { // not DONE - return; - } - + xhr.onload = function() { // If the response is a JSON string which composes an array, call handlePluginsObject. // If the request fails, or the response is not a JSON array, just call finishPluginLoading. - if (this.status == 200) { - var obj = JSON.parse(this.responseText); - if (obj && obj instanceof Array && obj.length > 0) { - handlePluginsObject(obj); - } else { - finishPluginLoading(); - } + var obj = JSON.parse(this.responseText); + if (obj && obj instanceof Array && obj.length > 0) { + handlePluginsObject(obj); } else { finishPluginLoading(); } }; + xhr.onerror = function() { + finishPluginLoading(); + }; xhr.open('GET', 'cordova_plugins.json', true); // Async xhr.send(); } - catch(err) { + catch(err){ finishPluginLoading(); } }(window));
