You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/10/30 09:36:51 UTC
[1/2] js commit: move require into function scope
Updated Branches:
refs/heads/2.9.x f911603c6 -> 138e92722
move require into function scope
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/630a4f48
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/630a4f48
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/630a4f48
Branch: refs/heads/2.9.x
Commit: 630a4f488841e15ad97c13cfb09af7755f6983ca
Parents: f911603
Author: purplecabbage <pu...@gmail.com>
Authored: Tue Oct 29 01:07:54 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Tue Oct 29 01:07:54 2013 -0700
----------------------------------------------------------------------
lib/windowsphone/platform.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/630a4f48/lib/windowsphone/platform.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/platform.js b/lib/windowsphone/platform.js
index 851ef09..fa8dadf 100644
--- a/lib/windowsphone/platform.js
+++ b/lib/windowsphone/platform.js
@@ -19,12 +19,14 @@
*
*/
-var cordova = require('cordova'),
- exec = require('cordova/exec');
+
module.exports = {
id: "windowsphone",
initialize:function() {
+ var cordova = require('cordova'),
+ exec = require('cordova/exec');
+
var modulemapper = require('cordova/modulemapper');
modulemapper.loadMatchingModules(/cordova.*\/plugininit$/);
[2/2] js commit: readying 2.9.1
Posted by pu...@apache.org.
readying 2.9.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/138e9272
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/138e9272
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/138e9272
Branch: refs/heads/2.9.x
Commit: 138e9272243d4e0ccc9ade2fb5c19022415d65a4
Parents: 630a4f4
Author: purplecabbage <pu...@gmail.com>
Authored: Wed Oct 30 01:34:59 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Wed Oct 30 01:34:59 2013 -0700
----------------------------------------------------------------------
lib/windowsphone/platform.js | 2 +
lib/windowsphone/plugin/file/symbols.js | 25 ----
lib/windowsphone/plugin/filetransfer/symbols.js | 25 ----
lib/windowsphone/plugin/inappbrowser/symbols.js | 24 ----
lib/windowsphone/plugin/media/symbols.js | 25 ----
.../plugin/windowsphone/FileTransfer.js | 123 -------------------
.../plugin/windowsphone/FileUploadOptions.js | 47 -------
lib/windowsphone/plugin/windowsphone/console.js | 45 -------
.../plugin/windowsphone/console/symbols.js | 25 ----
9 files changed, 2 insertions(+), 339 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/platform.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/platform.js b/lib/windowsphone/platform.js
index fa8dadf..8d6d2f2 100644
--- a/lib/windowsphone/platform.js
+++ b/lib/windowsphone/platform.js
@@ -35,6 +35,8 @@ module.exports = {
modulemapper.mapModules(window);
+ window.File = require("cordova/plugin/File");
+
// Inject a listener for the backbutton, and tell native to override the flag (true/false) when we have 1 or more, or 0, listeners
var backButtonChannel = cordova.addDocumentEventHandler('backbutton');
backButtonChannel.onHasSubscribersChange = function() {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/file/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/file/symbols.js b/lib/windowsphone/plugin/file/symbols.js
deleted file mode 100644
index b260a54..0000000
--- a/lib/windowsphone/plugin/file/symbols.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper'),
- symbolshelper = require('cordova/plugin/file/symbolshelper');
-
-symbolshelper(modulemapper.defaults);
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/filetransfer/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/filetransfer/symbols.js b/lib/windowsphone/plugin/filetransfer/symbols.js
deleted file mode 100644
index 923dc96..0000000
--- a/lib/windowsphone/plugin/filetransfer/symbols.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper');
-
-modulemapper.clobbers('cordova/plugin/windowsphone/FileTransfer', 'FileTransfer');
-modulemapper.clobbers('cordova/plugin/FileTransferError', 'FileTransferError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/inappbrowser/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/inappbrowser/symbols.js b/lib/windowsphone/plugin/inappbrowser/symbols.js
deleted file mode 100644
index 1b0866e..0000000
--- a/lib/windowsphone/plugin/inappbrowser/symbols.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper');
-
-modulemapper.clobbers('cordova/plugin/InAppBrowser', 'open');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/media/symbols.js b/lib/windowsphone/plugin/media/symbols.js
deleted file mode 100644
index d97c647..0000000
--- a/lib/windowsphone/plugin/media/symbols.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper');
-
-modulemapper.defaults('cordova/plugin/Media', 'Media');
-modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/windowsphone/FileTransfer.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/windowsphone/FileTransfer.js b/lib/windowsphone/plugin/windowsphone/FileTransfer.js
deleted file mode 100644
index b2f8686..0000000
--- a/lib/windowsphone/plugin/windowsphone/FileTransfer.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-var exec = require('cordova/exec'),
- FileTransferError = require('cordova/plugin/FileTransferError');
-
-// Note that the only difference between this and the default implementation is the
-// object literal passed to exec() in upload - jm
-
-/**
- * FileTransfer uploads a file to a remote server.
- * @constructor
- */
-var FileTransfer = function() {};
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server
-* using a multipart HTTP request.
-* @param filePath {String} Full path of the file on the device
-* @param server {String} URL of the server to receive the file
-* @param successCallback (Function} Callback to be invoked when upload has completed
-* @param errorCallback {Function} Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
-* @param trustAllHosts {Boolean} Optional trust all hosts (e.g. for self-signed certs), defaults to false
-*/
-
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
-
- // sanity parameter checking
- if (!filePath || !server) throw new Error("FileTransfer.upload requires filePath and server URL parameters at the minimum.");
- // check for options
- var fileKey = null;
- var fileName = null;
- var mimeType = null;
- var params = null;
- var chunkedMode = true;
-
- if (options) {
- fileKey = options.fileKey;
- fileName = options.fileName;
- mimeType = options.mimeType;
- if (options.chunkedMode !== null || typeof options.chunkedMode != "undefined") {
- chunkedMode = options.chunkedMode;
- }
-
- // if options are specified, and NOT a string already, we will stringify it.
- if(options.params && typeof options.params != typeof "") {
- var arrParams = [];
- for(var v in options.params) {
- arrParams.push(v + "=" + options.params[v]);
- }
- params = encodeURI(arrParams.join("&"));
- }
- }
-
- var fail = function(e) {
- var error = new FileTransferError(e.code, e.source, e.target, e.http_status);
- errorCallback(error);
- };
- exec(successCallback, fail, 'FileTransfer', 'upload', [{"filePath":filePath,
- "server":server,
- "fileKey":fileKey,
- "fileName":fileName,
- "mimeType":mimeType,
- "params":params,
- "trustAllHosts":trustAllHosts,
- "chunkedMode":chunkedMode}]);
-};
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String} URL of the server to receive the file
- * @param target {String} Full path of the file on the device
- * @param successCallback (Function} Callback to be invoked when upload has completed
- * @param errorCallback {Function} Callback to be invoked upon error
- */
-
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
- // sanity parameter checking
- if (!source || !target) throw new Error("FileTransfer.download requires source URI and target URI parameters at the minimum.");
- var win = function(result) {
- var entry = null;
- if (result.isDirectory) {
- entry = new (require('cordova/plugin/DirectoryEntry'))();
- }
- else if (result.isFile) {
- entry = new (require('cordova/plugin/FileEntry'))();
- }
- entry.isDirectory = result.isDirectory;
- entry.isFile = result.isFile;
- entry.name = result.name;
- entry.fullPath = result.fullPath;
- successCallback(entry);
- };
-
- var fail = function(e) {
- var error = new FileTransferError(e.code, e.source, e.target, e.http_status);
- errorCallback(error);
- };
-
- exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
-};
-
-
-module.exports = FileTransfer;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/windowsphone/FileUploadOptions.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/windowsphone/FileUploadOptions.js b/lib/windowsphone/plugin/windowsphone/FileUploadOptions.js
deleted file mode 100644
index 44b0978..0000000
--- a/lib/windowsphone/plugin/windowsphone/FileUploadOptions.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @constructor
- * @param fileKey {String} Name of file request parameter.
- * @param fileName {String} Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String} Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object} Object with key: value params to send to the server.
- */
-var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
- this.fileKey = fileKey || null;
- this.fileName = fileName || null;
- this.mimeType = mimeType || null;
-
- if(params && typeof params != typeof "") {
- var arrParams = [];
- for(var v in params) {
- arrParams.push(v + "=" + params[v]);
- }
- this.params = encodeURIComponent(arrParams.join("&"));
- }
- else {
- this.params = params || null;
- }
-};
-
-module.exports = FileUploadOptions;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/windowsphone/console.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/windowsphone/console.js b/lib/windowsphone/plugin/windowsphone/console.js
deleted file mode 100644
index 20197d5..0000000
--- a/lib/windowsphone/plugin/windowsphone/console.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var exec = require('cordova/exec'),
- channel = require('cordova/channel');
-var cordova = require("cordova");
-
-var debugConsole = {
- log:function(msg){
- exec(null,null,"DebugConsole","log",msg);
- },
- warn:function(msg){
- exec(null,null,"DebugConsole","warn",msg);
- },
- error:function(msg){
- exec(null,null,"DebugConsole","error",msg);
- }
-};
-
-var oldOnError = window.onerror;
-window.onerror = function(msg,fileName,line) {
- oldOnError && oldOnError(msg,fileName,line);
- debugConsole.error(msg + " file:" + fileName + " Line:" + line);
-};
-
-module.exports = debugConsole;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/138e9272/lib/windowsphone/plugin/windowsphone/console/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/windowsphone/console/symbols.js b/lib/windowsphone/plugin/windowsphone/console/symbols.js
deleted file mode 100644
index 5990b72..0000000
--- a/lib/windowsphone/plugin/windowsphone/console/symbols.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper');
-
-modulemapper.clobbers('cordova/plugin/windowsphone/console', 'navigator.console');
-modulemapper.clobbers('cordova/plugin/windowsphone/console', 'console');