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 2014/11/22 03:22:28 UTC
js commit: Removed 'windows8' target. it is identical to 'windows'
Repository: cordova-js
Updated Branches:
refs/heads/master 77cab1aab -> 1e7f79fe0
Removed 'windows8' target. it is identical to 'windows'
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/1e7f79fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/1e7f79fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/1e7f79fe
Branch: refs/heads/master
Commit: 1e7f79fe097d90c769bacdb5fff7e26f05d77e0c
Parents: 77cab1a
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Nov 21 18:15:15 2014 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Nov 21 18:15:15 2014 -0800
----------------------------------------------------------------------
Gruntfile.js | 2 -
src/windows8/exec.js | 89 ------------------------------
src/windows8/platform.js | 67 ----------------------
src/windows8/windows8/commandProxy.js | 23 --------
4 files changed, 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/1e7f79fe/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index a77a172..7635891 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,7 +28,6 @@ module.exports = function(grunt) {
"osx": {},
"test": {},
"windows": { useWindowsLineEndings: true },
- "windows8": { useWindowsLineEndings: true },
"windowsphone": { useWindowsLineEndings: true },
"firefoxos": {},
"webos": {},
@@ -43,7 +42,6 @@ module.exports = function(grunt) {
"osx": {},
//"test": {},
"windows": { useWindowsLineEndings: true },
- "windows8": { useWindowsLineEndings: true },
"windowsphone": { useWindowsLineEndings: true },
"firefoxos": {},
"ubuntu": {},
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/1e7f79fe/src/windows8/exec.js
----------------------------------------------------------------------
diff --git a/src/windows8/exec.js b/src/windows8/exec.js
deleted file mode 100644
index 3e93f0b..0000000
--- a/src/windows8/exec.js
+++ /dev/null
@@ -1,89 +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.
- *
-*/
-
-/*jslint sloppy:true, plusplus:true*/
-/*global require, module, console */
-
-var cordova = require('cordova');
-var execProxy = require('cordova/exec/proxy');
-
-/**
- * Execute a cordova command. It is up to the native side whether this action
- * is synchronous or asynchronous. The native side can return:
- * Synchronous: PluginResult object as a JSON string
- * Asynchronous: Empty string ""
- * If async, the native side will cordova.callbackSuccess or cordova.callbackError,
- * depending upon the result of the action.
- *
- * @param {Function} success The success callback
- * @param {Function} fail The fail callback
- * @param {String} service The name of the service to use
- * @param {String} action Action to be run in cordova
- * @param {String[]} [args] Zero or more arguments to pass to the method
- */
-module.exports = function (success, fail, service, action, args) {
-
- var proxy = execProxy.get(service, action),
- callbackId,
- onSuccess,
- onError;
-
- args = args || [];
-
- if (proxy) {
- callbackId = service + cordova.callbackId++;
- // console.log("EXEC:" + service + " : " + action);
- if (typeof success === "function" || typeof fail === "function") {
- cordova.callbacks[callbackId] = {success: success, fail: fail};
- }
- try {
- // callbackOptions param represents additional optional parameters command could pass back, like keepCallback or
- // custom callbackId, for example {callbackId: id, keepCallback: true, status: cordova.callbackStatus.JSON_EXCEPTION }
- // CB-5806 [Windows8] Add keepCallback support to proxy
- onSuccess = function (result, callbackOptions) {
- callbackOptions = callbackOptions || {};
- cordova.callbackSuccess(callbackOptions.callbackId || callbackId,
- {
- status: callbackOptions.status || cordova.callbackStatus.OK,
- message: result,
- keepCallback: callbackOptions.keepCallback || false
- });
- };
- onError = function (err, callbackOptions) {
- callbackOptions = callbackOptions || {};
- cordova.callbackError(callbackOptions.callbackId || callbackId,
- {
- status: callbackOptions.status || cordova.callbackStatus.ERROR,
- message: err,
- keepCallback: callbackOptions.keepCallback || false
- });
- };
- proxy(onSuccess, onError, args);
-
- } catch (e) {
- console.log("Exception calling native with command :: " + service + " :: " + action + " ::exception=" + e);
- }
- } else {
- if (typeof fail === "function") {
- fail("Missing Command Error");
- }
- }
-};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/1e7f79fe/src/windows8/platform.js
----------------------------------------------------------------------
diff --git a/src/windows8/platform.js b/src/windows8/platform.js
deleted file mode 100755
index 561842e..0000000
--- a/src/windows8/platform.js
+++ /dev/null
@@ -1,67 +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.
- *
-*/
-
-module.exports = {
- id: 'windows8',
- bootstrap:function() {
- var cordova = require('cordova'),
- exec = require('cordova/exec'),
- channel = cordova.require('cordova/channel'),
- modulemapper = require('cordova/modulemapper');
-
- modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
- channel.onNativeReady.fire();
-
- var onWinJSReady = function () {
- var app = WinJS.Application;
- var checkpointHandler = function checkpointHandler() {
- cordova.fireDocumentEvent('pause',null,true);
- };
-
- var resumingHandler = function resumingHandler() {
- cordova.fireDocumentEvent('resume',null,true);
- };
-
- app.addEventListener("checkpoint", checkpointHandler);
- Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
- app.start();
-
- };
-
- if (!window.WinJS) {
- // <script src="//Microsoft.WinJS.1.0/js/base.js"></script>
- var scriptElem = document.createElement("script");
- if (navigator.appVersion.indexOf("MSAppHost/2.0;") > -1) {
- // windows 8.1 + IE 11
- scriptElem.src = "//Microsoft.WinJS.2.0/js/base.js";
- }
- else {
- // windows 8.0 + IE 10
- scriptElem.src = "//Microsoft.WinJS.1.0/js/base.js";
- }
- scriptElem.addEventListener("load", onWinJSReady);
- document.head.appendChild(scriptElem);
- }
- else {
- onWinJSReady();
- }
- }
-};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/1e7f79fe/src/windows8/windows8/commandProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/windows8/commandProxy.js b/src/windows8/windows8/commandProxy.js
deleted file mode 100644
index cbdf720..0000000
--- a/src/windows8/windows8/commandProxy.js
+++ /dev/null
@@ -1,23 +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.
- *
-*/
-
-console.log('WARNING: please require cordova/exec/proxy instead');
-module.exports = require('cordova/exec/proxy');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org