Merge pull request #2 from purplecabbage/2.4.0Prep
2.4.0 prep
diff --git a/VERSION b/VERSION
index 6f905f8..9183195 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.0rc2
\ No newline at end of file
+2.4.0
\ No newline at end of file
diff --git a/example/www/cordova-2.4.0.js b/example/www/cordova-2.4.0.js
index d62f792..731c4c5 100644
--- a/example/www/cordova-2.4.0.js
+++ b/example/www/cordova-2.4.0.js
@@ -1,8 +1,8 @@
// Platform: windowsphone
-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
-// File generated at :: Fri Feb 01 2013 14:32:23 GMT-0800 (Pacific Standard Time)
+// File generated at :: Mon Feb 04 2013 11:20:37 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1154,6 +1154,12 @@
},
console:{
path: "cordova/plugin/windowsphone/console"
+ },
+ FileTransfer: {
+ path: 'cordova/plugin/windowsphone/FileTransfer'
+ },
+ open : {
+ path: 'cordova/plugin/InAppBrowser'
}
}
};
@@ -1432,6 +1438,7 @@
CELL_2G: "2g",
CELL_3G: "3g",
CELL_4G: "4g",
+ CELL:"cellular",
NONE: "none"
};
diff --git a/templates/description.txt b/templates/description.txt
index 484d994..af1934a 100644
--- a/templates/description.txt
+++ b/templates/description.txt
@@ -1,4 +1,4 @@
CordovaStarter
-Starter project for building a Cordova app for Windows Phone version: 2.4.0rc2
+Starter project for building a Cordova app for Windows Phone version: 2.4.0
diff --git a/templates/full/VERSION b/templates/full/VERSION
index 6f905f8..9183195 100644
--- a/templates/full/VERSION
+++ b/templates/full/VERSION
@@ -1 +1 @@
-2.4.0rc2
\ No newline at end of file
+2.4.0
\ No newline at end of file
diff --git a/templates/full/www/cordova-2.4.0.js b/templates/full/www/cordova-2.4.0.js
index d62f792..731c4c5 100644
--- a/templates/full/www/cordova-2.4.0.js
+++ b/templates/full/www/cordova-2.4.0.js
@@ -1,8 +1,8 @@
// Platform: windowsphone
-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
-// File generated at :: Fri Feb 01 2013 14:32:23 GMT-0800 (Pacific Standard Time)
+// File generated at :: Mon Feb 04 2013 11:20:37 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1154,6 +1154,12 @@
},
console:{
path: "cordova/plugin/windowsphone/console"
+ },
+ FileTransfer: {
+ path: 'cordova/plugin/windowsphone/FileTransfer'
+ },
+ open : {
+ path: 'cordova/plugin/InAppBrowser'
}
}
};
@@ -1432,6 +1438,7 @@
CELL_2G: "2g",
CELL_3G: "3g",
CELL_4G: "4g",
+ CELL:"cellular",
NONE: "none"
};
diff --git a/templates/standalone/VERSION b/templates/standalone/VERSION
index 6f905f8..9183195 100644
--- a/templates/standalone/VERSION
+++ b/templates/standalone/VERSION
@@ -1 +1 @@
-2.4.0rc2
\ No newline at end of file
+2.4.0
\ No newline at end of file
diff --git a/templates/standalone/cordovalib/Commands/Device.cs b/templates/standalone/cordovalib/Commands/Device.cs
index f970401..c07c6f1 100644
--- a/templates/standalone/cordovalib/Commands/Device.cs
+++ b/templates/standalone/cordovalib/Commands/Device.cs
@@ -73,7 +73,7 @@
get
{
// TODO: should be able to dynamically read the Cordova version from somewhere...
- return "2.4.0rc2";
+ return "2.4.0";
}
}
diff --git a/templates/standalone/cordovalib/Commands/Media.cs b/templates/standalone/cordovalib/Commands/Media.cs
index 69265dd..90c54f1 100644
--- a/templates/standalone/cordovalib/Commands/Media.cs
+++ b/templates/standalone/cordovalib/Commands/Media.cs
@@ -288,7 +288,7 @@
if (!Media.players.ContainsKey(mediaOptions.Id))
{
audio = new AudioPlayer(this, mediaOptions.Id);
- Media.players.Add(mediaOptions.Id, audio);
+ Media.players[mediaOptions.Id] = audio;
}
else
{
diff --git a/templates/standalone/cordovalib/NativeExecution.cs b/templates/standalone/cordovalib/NativeExecution.cs
index 4b8b52e..9459ffc 100644
--- a/templates/standalone/cordovalib/NativeExecution.cs
+++ b/templates/standalone/cordovalib/NativeExecution.cs
@@ -90,6 +90,7 @@
this.OnCommandResult(commandCallParams.CallbackId, res);
};
+ bc.OnCommandResult -= OnCommandResultHandler;
bc.OnCommandResult += OnCommandResultHandler;
EventHandler<ScriptCallback> OnCustomScriptHandler = delegate(object o, ScriptCallback script)
@@ -97,7 +98,7 @@
this.InvokeScriptCallback(script);
};
-
+ bc.OnCustomScript -= OnCustomScriptHandler;
bc.OnCustomScript += OnCustomScriptHandler;
// TODO: alternative way is using thread pool (ThreadPool.QueueUserWorkItem) instead of
diff --git a/templates/standalone/www/cordova-2.4.0.js b/templates/standalone/www/cordova-2.4.0.js
index d62f792..731c4c5 100644
--- a/templates/standalone/www/cordova-2.4.0.js
+++ b/templates/standalone/www/cordova-2.4.0.js
@@ -1,8 +1,8 @@
// Platform: windowsphone
-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
-// File generated at :: Fri Feb 01 2013 14:32:23 GMT-0800 (Pacific Standard Time)
+// File generated at :: Mon Feb 04 2013 11:20:37 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1154,6 +1154,12 @@
},
console:{
path: "cordova/plugin/windowsphone/console"
+ },
+ FileTransfer: {
+ path: 'cordova/plugin/windowsphone/FileTransfer'
+ },
+ open : {
+ path: 'cordova/plugin/InAppBrowser'
}
}
};
@@ -1432,6 +1438,7 @@
CELL_2G: "2g",
CELL_3G: "3g",
CELL_4G: "4g",
+ CELL:"cellular",
NONE: "none"
};
