incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [3/9] js commit: [Windows8] merges
Date Wed, 17 Oct 2012 20:38:34 GMT
[Windows8] merges


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/eeeb0c9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/eeeb0c9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/eeeb0c9b

Branch: refs/heads/master
Commit: eeeb0c9b9f3200c99d7d97b7d8d1a3317d70e3b2
Parents: 9eaa875 40ef529
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue Oct 16 18:42:49 2012 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue Oct 16 18:42:49 2012 -0700

----------------------------------------------------------------------
 lib/common/commandProxy.js                         |    1 +
 lib/windows8/platform.js                           |   16 +
 lib/windows8/plugin/windows8/CaptureProxy.js       |    4 +-
 lib/windows8/plugin/windows8/DeviceProxy.js        |   35 +-
 lib/windows8/plugin/windows8/FileProxy.js          |  439 ++++++++-------
 lib/windows8/plugin/windows8/FileTransferProxy.js  |    3 +
 lib/windows8/plugin/windows8/MediaProxy.js         |    1 +
 lib/windows8/plugin/windows8/NetworkStatusProxy.js |   43 +-
 8 files changed, 308 insertions(+), 234 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/common/commandProxy.js
----------------------------------------------------------------------
diff --cc lib/common/commandProxy.js
index f6b2a04,e640003..787ae02
--- a/lib/common/commandProxy.js
+++ b/lib/common/commandProxy.js
@@@ -43,4 -43,4 +43,5 @@@ module.exports = 
      get:function(service,action) {
          return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
      }
 -};
 +};
++

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/platform.js
----------------------------------------------------------------------
diff --cc lib/windows8/platform.js
index 36ee066,47adbdc..a70766d
mode 100755,100644..100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@@ -34,9 -34,11 +34,13 @@@ require('cordova/plugin/windows8/Camera
  require('cordova/plugin/windows8/CaptureProxy');
  require('cordova/plugin/windows8/CompassProxy');
  require('cordova/plugin/windows8/FileProxy');
++
+ require('cordova/plugin/windows8/FileTransferProxy');
  require('cordova/plugin/windows8/MediaProxy');
  require('cordova/plugin/windows8/NotificationProxy');
  
+ 
++
  module.exports = {
      id: "windows8",
      initialize:function() {

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/CaptureProxy.js
----------------------------------------------------------------------
diff --cc lib/windows8/plugin/windows8/CaptureProxy.js
index cdec66e,8f1970a..28739b8
--- a/lib/windows8/plugin/windows8/CaptureProxy.js
+++ b/lib/windows8/plugin/windows8/CaptureProxy.js
@@@ -1,5 -1,5 +1,3 @@@
--/*global Windows:true */
--
  /*
   *
   * Licensed to the Apache Software Foundation (ASF) under one
@@@ -21,7 -21,7 +19,7 @@@
   *
  */
  
--
++/*global Windows:true */
  
  var MediaFile = require('cordova/plugin/MediaFile');
  var CaptureError = require('cordova/plugin/CaptureError');

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --cc lib/windows8/plugin/windows8/DeviceProxy.js
index 9fe895b,faf9869..757c592
--- a/lib/windows8/plugin/windows8/DeviceProxy.js
+++ b/lib/windows8/plugin/windows8/DeviceProxy.js
@@@ -24,23 -24,23 +24,24 @@@ var cordova = require('cordova')
  
  module.exports = {
  
--        getDeviceInfo:function(win,fail,args){
--            console.log("NativeProxy::getDeviceInfo");
--
--            var hostNames = Windows.Networking.Connectivity.NetworkInformation.getHostNames();
--                
--            var name = "unknown";
--            hostNames.some(function (nm) {
--                if (nm.displayName.indexOf(".local") > -1) {
--                    name = nm.displayName.split(".local")[0];
--                    return true;
--                }
--            });
--
--            setTimeout(function(){
--                win({platform:"windows8", version:"8", name:name, uuid:"TODO", cordova:"2.2.0"});
--            },0);
--        }
++    getDeviceInfo:function(win,fail,args){
++        console.log("NativeProxy::getDeviceInfo");
++
++        var hostNames = Windows.Networking.Connectivity.NetworkInformation.getHostNames();
++            
++        var name = "unknown";
++        hostNames.some(function (nm) {
++            if (nm.displayName.indexOf(".local") > -1) {
++                name = nm.displayName.split(".local")[0];
++                return true;
++            }
++        });
++
++        setTimeout(function(){
++            win({platform:"windows8", version:"8", name:name, uuid:"TODO", cordova:"2.2.0"});
++        },0);
++    }
  };
  
 -require("cordova/commandProxy").add("Device",module.exports);
 +require("cordova/commandProxy").add("Device",module.exports);
++

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/FileProxy.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --cc lib/windows8/plugin/windows8/FileTransferProxy.js
index fb61ae3,1ce79d0..00b65cf
--- a/lib/windows8/plugin/windows8/FileTransferProxy.js
+++ b/lib/windows8/plugin/windows8/FileTransferProxy.js
@@@ -105,3 -106,5 +106,5 @@@ module.exports = 
          });
      }
  };
+ 
 -require("cordova/commandProxy").add("FileTransfer",module.exports);
++require("cordova/commandProxy").add("FileTransfer",module.exports);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/MediaProxy.js
----------------------------------------------------------------------
diff --cc lib/windows8/plugin/windows8/MediaProxy.js
index 2f03382,a9d0070..93620ac
--- a/lib/windows8/plugin/windows8/MediaProxy.js
+++ b/lib/windows8/plugin/windows8/MediaProxy.js
@@@ -21,9 -21,8 +21,10 @@@
  
  /*global Windows:true */
  
 -var cordova = require('cordova');
 +var cordova = require('cordova'),
 +    Media = require('cordova/plugin/Media');
 +
+ 
  module.exports = {
      mediaCaptureMrg:null,
  

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/eeeb0c9b/lib/windows8/plugin/windows8/NetworkStatusProxy.js
----------------------------------------------------------------------


Mime
View raw message