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 2012/02/22 09:15:23 UTC
[7/29] wp7 commit: Moar renames
Moar renames
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/f95d8786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/f95d8786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/f95d8786
Branch: refs/heads/master
Commit: f95d8786d92f0899db26a0b62a4183b6962118d9
Parents: 4789ce6
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Feb 9 16:54:17 2012 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Feb 9 16:54:17 2012 -0800
----------------------------------------------------------------------
example/GapSourceDictionary.xml | 2 +-
example/www/accelerometer.html | 2 +-
example/www/accelerometer2.html | 2 +-
example/www/audio.html | 2 +-
example/www/calculator.html | 2 +-
example/www/camera.html | 2 +-
example/www/capture.html | 2 +-
example/www/compass.html | 2 +-
example/www/contacts.html | 2 +-
example/www/events.html | 2 +-
example/www/file.html | 2 +-
example/www/index.html | 2 +-
example/www/location.html | 2 +-
example/www/network.html | 2 +-
example/www/notification.html | 2 +-
example/www/storage.html | 2 +-
framework/Cordova/Commands/Compass.cs | 2 +-
framework/js/BuildJSConcat.js | 8 +-
framework/js/compass.js | 21 +-
framework/js/cordova-1.4.1-core.js | 2594 ++++++++++
framework/js/cordova-1.4.1.js | 3832 +++++++++++++++
framework/js/cordova.js.base | 639 +++
framework/js/phonegap-1.4.1-core.js | 2579 ----------
framework/js/phonegap-1.4.1.js | 3812 --------------
framework/js/phonegap.js.base | 651 ---
tests/MobileSpecUnitTests/Calculator.cs | 8 +-
tests/MobileSpecUnitTests/GapSourceDictionary.xml | 2 +-
.../MobileSpecUnitTests/MobileSpecUnitTests.csproj | 2 +-
tests/MobileSpecUnitTests/www/autotest/index.html | 10 +-
.../www/autotest/tests/compass.tests.js | 23 +-
.../www/autotest/tests/media.tests.js | 4 +-
tests/MobileSpecUnitTests/www/cordova-1.4.1.js | 3832 +++++++++++++++
tests/MobileSpecUnitTests/www/index.html | 2 +-
tests/MobileSpecUnitTests/www/phonegap-1.3.0.js | 3682 --------------
34 files changed, 10964 insertions(+), 10771 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/GapSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/example/GapSourceDictionary.xml b/example/GapSourceDictionary.xml
index 6bba83b..e77dfe5 100644
--- a/example/GapSourceDictionary.xml
+++ b/example/GapSourceDictionary.xml
@@ -16,6 +16,6 @@
<FilePath Value="www\master.css"/>
<FilePath Value="www\network.html"/>
<FilePath Value="www\notification.html"/>
- <FilePath Value="www\phonegap-1.3.0.js"/>
+ <FilePath Value="www\cordova-1.3.0.js"/>
<FilePath Value="www\storage.html"/>
</GapSourceDictionary>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/accelerometer.html
----------------------------------------------------------------------
diff --git a/example/www/accelerometer.html b/example/www/accelerometer.html
index d04e4ca..b1b97a8 100644
--- a/example/www/accelerometer.html
+++ b/example/www/accelerometer.html
@@ -24,7 +24,7 @@
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.3.0.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/accelerometer2.html
----------------------------------------------------------------------
diff --git a/example/www/accelerometer2.html b/example/www/accelerometer2.html
index 4b273d8..0c1023a 100644
--- a/example/www/accelerometer2.html
+++ b/example/www/accelerometer2.html
@@ -24,7 +24,7 @@
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.3.0.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/audio.html
----------------------------------------------------------------------
diff --git a/example/www/audio.html b/example/www/audio.html
index 449331b..d4c806f 100644
--- a/example/www/audio.html
+++ b/example/www/audio.html
@@ -7,7 +7,7 @@
<title>PhoneGap</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen">
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.3.0.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/calculator.html
----------------------------------------------------------------------
diff --git a/example/www/calculator.html b/example/www/calculator.html
index aa19521..92c218e 100644
--- a/example/www/calculator.html
+++ b/example/www/calculator.html
@@ -21,7 +21,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/camera.html
----------------------------------------------------------------------
diff --git a/example/www/camera.html b/example/www/camera.html
index c2051ed..15179ee 100644
--- a/example/www/camera.html
+++ b/example/www/camera.html
@@ -21,7 +21,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/capture.html
----------------------------------------------------------------------
diff --git a/example/www/capture.html b/example/www/capture.html
index e3aa3d5..3188c8e 100644
--- a/example/www/capture.html
+++ b/example/www/capture.html
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="master.css" type="text/css" media="screen"/>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/compass.html
----------------------------------------------------------------------
diff --git a/example/www/compass.html b/example/www/compass.html
index a579ae1..21625c1 100644
--- a/example/www/compass.html
+++ b/example/www/compass.html
@@ -24,7 +24,7 @@
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/contacts.html
----------------------------------------------------------------------
diff --git a/example/www/contacts.html b/example/www/contacts.html
index 8bcde1e..92e8727 100644
--- a/example/www/contacts.html
+++ b/example/www/contacts.html
@@ -22,7 +22,7 @@
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/events.html
----------------------------------------------------------------------
diff --git a/example/www/events.html b/example/www/events.html
index b913067..6e5103d 100644
--- a/example/www/events.html
+++ b/example/www/events.html
@@ -21,7 +21,7 @@
</script>
<link rel="stylesheet" href="master.css" type="text/css" media="screen">
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/file.html
----------------------------------------------------------------------
diff --git a/example/www/file.html b/example/www/file.html
index 9ae88f9..ec52969 100644
--- a/example/www/file.html
+++ b/example/www/file.html
@@ -21,7 +21,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/index.html
----------------------------------------------------------------------
diff --git a/example/www/index.html b/example/www/index.html
index 1820840..8fbff6e 100644
--- a/example/www/index.html
+++ b/example/www/index.html
@@ -22,7 +22,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/location.html
----------------------------------------------------------------------
diff --git a/example/www/location.html b/example/www/location.html
index 1d96be2..76cdfc1 100644
--- a/example/www/location.html
+++ b/example/www/location.html
@@ -23,7 +23,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/network.html
----------------------------------------------------------------------
diff --git a/example/www/network.html b/example/www/network.html
index 1f243e6..aa2d726 100644
--- a/example/www/network.html
+++ b/example/www/network.html
@@ -22,7 +22,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/notification.html
----------------------------------------------------------------------
diff --git a/example/www/notification.html b/example/www/notification.html
index aacc600..bf65ebf 100644
--- a/example/www/notification.html
+++ b/example/www/notification.html
@@ -22,7 +22,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/example/www/storage.html
----------------------------------------------------------------------
diff --git a/example/www/storage.html b/example/www/storage.html
index 1d873ea..fdfce6a 100644
--- a/example/www/storage.html
+++ b/example/www/storage.html
@@ -23,7 +23,7 @@
console.log("Installed console ! ");
</script>
- <script type="text/javascript" charset="utf-8" src="phonegap-1.3.0.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/framework/Cordova/Commands/Compass.cs
----------------------------------------------------------------------
diff --git a/framework/Cordova/Commands/Compass.cs b/framework/Cordova/Commands/Compass.cs
index f0dd842..f08e017 100644
--- a/framework/Cordova/Commands/Compass.cs
+++ b/framework/Cordova/Commands/Compass.cs
@@ -143,7 +143,7 @@ namespace WP7GapClassLib.Cordova.Commands
{
if (!DeviceCompass.IsSupported)
{
- DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, Not_Supported));
+ DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, "{code:" + Not_Supported + "}"));
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/framework/js/BuildJSConcat.js
----------------------------------------------------------------------
diff --git a/framework/js/BuildJSConcat.js b/framework/js/BuildJSConcat.js
index 5ce0d01..9eee50a 100644
--- a/framework/js/BuildJSConcat.js
+++ b/framework/js/BuildJSConcat.js
@@ -3,7 +3,7 @@
var versionStr = "1.4.1";
var allSourceFiles = [
"disclaimer.txt",
- "phonegap.js.base",
+ "cordova.js.base",
"accelerometer.js",
"camera.js",
"capture.js",
@@ -22,7 +22,7 @@ var allSourceFiles = [
var coreSourceFiles = [
"disclaimer.txt",
- "phonegap.js.base",
+ "cordova.js.base",
"debugConsole.js",
"device.js",
"DOMStorage.js",
@@ -43,7 +43,7 @@ var fso = WScript.CreateObject("Scripting.FileSystemObject");
var folder = fso.GetFolder(".");
-var outFile = fso.CreateTextFile("phonegap-" + versionStr + ".js", true);
+var outFile = fso.CreateTextFile("cordova-" + versionStr + ".js", true);
for(var n = 0; n < allSourceFiles.length; n++)
{
@@ -55,7 +55,7 @@ for(var n = 0; n < allSourceFiles.length; n++)
outFile.WriteLine("");
}
-var outFile = fso.CreateTextFile("phonegap-" + versionStr + "-core.js", true);
+var outFile = fso.CreateTextFile("cordova-" + versionStr + "-core.js", true);
for(var n = 0; n < coreSourceFiles.length; n++)
{
var srcFile = fso.OpenTextFile(coreSourceFiles[n]);
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/f95d8786/framework/js/compass.js
----------------------------------------------------------------------
diff --git a/framework/js/compass.js b/framework/js/compass.js
index 1408a6e..9e583d4 100644
--- a/framework/js/compass.js
+++ b/framework/js/compass.js
@@ -67,9 +67,10 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o
successCallback(self.lastHeading);
}
- var onError = function(err)
+ var onError = function(res)
{
- if(err == CompassError.COMPASS_NOT_SUPPORTED)
+ var err = JSON.parse(res);
+ if(err.code == CompassError.COMPASS_NOT_SUPPORTED)
{
self.isCompassSupported = false;
}
@@ -83,7 +84,7 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o
{
var funk = function()
{
- errorCallback(CompassError.COMPASS_NOT_SUPPORTED);
+ errorCallback({code:CompassError.COMPASS_NOT_SUPPORTED});
};
window.setTimeout(funk,0); // async
}
@@ -123,15 +124,19 @@ Compass.prototype.watchHeading= function(successCallback, errorCallback, options
successCallback(self.lastHeading);
}
- var onError = function (err) {
+ var onError = function (res) {
+ var err = JSON.parse(res);
+ if(err.code == CompassError.COMPASS_NOT_SUPPORTED)
+ {
+ self.isCompassSupported = false;
+ }
+
errorCallback(err);
}
var id = Cordova.createUUID();
- var params = {id:id,
- frequency:((options && options.frequency) ? options.frequency : 100)};
-
+ var params = {id:id,frequency:((options && options.frequency) ? options.frequency : 100)};
Cordova.exec(onSuccess, onError, "Compass", "startWatch", params);
@@ -141,7 +146,7 @@ Compass.prototype.watchHeading= function(successCallback, errorCallback, options
{
var funk = function()
{
- errorCallback(CompassError.COMPASS_NOT_SUPPORTED);
+ errorCallback({code:CompassError.COMPASS_NOT_SUPPORTED});
};
window.setTimeout(funk,0); // async
return -1;