You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pp...@apache.org on 2013/05/17 16:22:27 UTC
[17/21] js commit: Merge branch 'master' into magnolia
Merge branch 'master' into magnolia
Conflicts:
lib/tizen/plugin/tizen/Device.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/2142edd0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/2142edd0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/2142edd0
Branch: refs/heads/master
Commit: 2142edd00727380b4f39bc7368e1966eb562672e
Parents: 8bcf44f 757fa3c
Author: pplaquette <pp...@apache.org>
Authored: Fri May 17 14:53:49 2013 +0200
Committer: pplaquette <pp...@apache.org>
Committed: Fri May 17 14:53:49 2013 +0200
----------------------------------------------------------------------
.jshintrc | 2 +-
Jakefile | 91 ++--
VERSION | 2 +-
build/packager.js | 23 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/platform.js | 5 +-
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/qnx/InAppBrowser.js | 86 ---
lib/blackberry/plugin/qnx/battery.js | 40 -
lib/blackberry/plugin/qnx/camera.js | 32 -
lib/blackberry/plugin/qnx/capture.js | 76 --
lib/blackberry/plugin/qnx/compass.js | 162 -----
lib/blackberry/plugin/qnx/device.js | 41 --
lib/blackberry/plugin/qnx/file.js | 424 -----------
lib/blackberry/plugin/qnx/fileTransfer.js | 205 ------
lib/blackberry/plugin/qnx/magnetometer.js | 45 --
lib/blackberry/plugin/qnx/manager.js | 60 --
lib/blackberry/plugin/qnx/network.js | 28 -
lib/blackberry/plugin/qnx/platform.js | 44 --
lib/blackberry10/exec.js | 49 ++
lib/blackberry10/platform.js | 37 +
lib/blackberry10/plugin/DirectoryEntry.js | 57 ++
lib/blackberry10/plugin/DirectoryReader.js | 47 ++
lib/blackberry10/plugin/Entry.js | 112 +++
lib/blackberry10/plugin/FileEntry.js | 47 ++
lib/blackberry10/plugin/FileReader.js | 90 +++
lib/blackberry10/plugin/FileSystem.js | 27 +
lib/blackberry10/plugin/FileWriter.js | 120 ++++
.../plugin/blackberry10/InAppBrowser.js | 86 +++
lib/blackberry10/plugin/blackberry10/capture.js | 76 ++
lib/blackberry10/plugin/blackberry10/compass.js | 162 +++++
lib/blackberry10/plugin/blackberry10/event.js | 102 +++
lib/blackberry10/plugin/blackberry10/exception.js | 74 ++
.../plugin/blackberry10/fileTransfer.js | 202 ++++++
lib/blackberry10/plugin/blackberry10/fileUtils.js | 47 ++
.../plugin/blackberry10/magnetometer.js | 45 ++
lib/blackberry10/plugin/blackberry10/media.js | 189 +++++
lib/blackberry10/plugin/blackberry10/utils.js | 556 +++++++++++++++
lib/blackberry10/plugin/blackberry10/vibrate.js | 31 +
lib/blackberry10/plugin/requestFileSystem.js | 38 +
.../plugin/resolveLocalFileSystemURI.js | 55 ++
lib/common/plugin/CaptureAudioOptions.js | 2 -
lib/common/plugin/CaptureImageOptions.js | 2 -
lib/common/plugin/CaptureVideoOptions.js | 2 -
lib/common/plugin/device.js | 6 +-
lib/common/plugin/logger.js | 48 +-
lib/common/plugin/notification.js | 8 +-
lib/firefoxos/plugin/firefoxos/device.js | 2 +-
lib/ios/exec.js | 18 +-
lib/ios/plugin/ios/logger/plugininit.js | 2 +-
lib/scripts/bootstrap-blackberry.js | 20 +-
lib/scripts/bootstrap-blackberry10.js | 136 ++++
lib/scripts/plugin_loader.js | 36 +-
lib/scripts/require.js | 21 +-
lib/tizen/plugin/tizen/Device.js | 4 +-
lib/windows8/platform.js | 4 +-
lib/windows8/plugin/windows8/DeviceProxy.js | 2 +-
lib/windowsphone/plugin/file/symbols.js | 2 -
.../plugin/windowsphone/notification/plugininit.js | 23 -
test/blackberry/qnx/test.battery.js | 72 --
test/blackberry/qnx/test.camera.js | 59 --
test/blackberry/qnx/test.capture.js | 222 ------
test/blackberry/qnx/test.compass.js | 61 --
test/blackberry/qnx/test.device.js | 48 --
test/blackberry/qnx/test.fileTransfer.js | 85 ---
test/blackberry/qnx/test.magnetometer.js | 80 --
test/blackberry/qnx/test.manager.js | 56 --
test/blackberry/qnx/test.network.js | 39 -
test/blackberry/qnx/test.platform.js | 123 ----
test/blackberry/test.exec.js | 16 +-
test/blackberry/test.platform.js | 25 +-
test/blackberry10/test.capture.js | 222 ++++++
test/blackberry10/test.compass.js | 61 ++
test/blackberry10/test.event.js | 188 +++++
test/blackberry10/test.magnetometer.js | 80 ++
test/runner.js | 2 +-
test/test.notification.js | 6 +-
test/test.require.js | 2 +-
78 files changed, 3124 insertions(+), 2280 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/2142edd0/lib/tizen/plugin/tizen/Device.js
----------------------------------------------------------------------
diff --cc lib/tizen/plugin/tizen/Device.js
index 15be7fe,75b12fe..daeb5ec
--- a/lib/tizen/plugin/tizen/Device.js
+++ b/lib/tizen/plugin/tizen/Device.js
@@@ -22,43 -22,36 +22,43 @@@
/*global tizen:false */
var channel = require('cordova/channel');
-// Tell cordova channel to wait on the CordovaInfoReady event
-channel.waitForInitialization('onCordovaInfoReady');
+console.log("TIZEN DEVICE START");
+
+
- // Tell cordova channel to wait on the CordovaInfoReady event
++// Tell cordova channel to wait on the CordovaInfoReady event - PPL is this useful?
+//channel.waitForInitialization('onCordovaInfoReady');
function Device() {
this.version = null;
this.uuid = null;
this.name = null;
+ this.model = null;
- this.cordova = "2.5.0";
+ this.cordova = CORDOVA_JS_BUILD_LABEL;
this.platform = "Tizen";
+
+ this.getDeviceInfo();
+}
- var me = this;
+Device.prototype.getDeviceInfo = function() {
+
+ var deviceCapabilities = tizen.systeminfo.getCapabilities();
+
+ if (deviceCapabilities) {
+
+ this.version = deviceCapabilities.platformVersion;
+ this.uuid = deviceCapabilities.duid;
+ this.model = deviceCapabilities.platformName;
+ this.name = this.model;
- function onSuccessCallback(sysInfoProp) {
- me.name = sysInfoProp.model;
- me.uuid = sysInfoProp.imei;
- me.version = sysInfoProp.version;
channel.onCordovaInfoReady.fire();
- }
+ }
+ else {
+ console.log("error initializing cordova: ");
+ }
+};
- function onErrorCallback(error) {
- console.log("error initializing cordova: " + error);
- }
+module.exports = new Device();
- channel.onCordovaReady.subscribe(function() {
- me.getDeviceInfo(onSuccessCallback, onErrorCallback);
- });
-}
+console.log("TIZEN DEVICE END");
-Device.prototype.getDeviceInfo = function(success, fail, args) {
- tizen.systeminfo.getPropertyValue("Device", success, fail);
-};
-module.exports = new Device();