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 2013/09/13 03:19:53 UTC
[18/31] git commit: Updated cordova.js and removed wildcards from
.csproj file
Updated cordova.js and removed wildcards from .csproj file
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/1668b445
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/1668b445
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/1668b445
Branch: refs/heads/master
Commit: 1668b4452e6b8dd4e611b876b00647b09551fc89
Parents: 116d4a6
Author: Benn Mapes <be...@gmail.com>
Authored: Mon Jul 15 12:12:50 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Jul 15 18:39:30 2013 -0700
----------------------------------------------------------------------
common/www/cordova.js | 9 +++++++--
wp7/template/CordovaWP7AppProj.csproj | 17 +++++++++++++----
wp8/template/CordovaWP8AppProj.csproj | 18 ++++++++++++++----
3 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/1668b445/common/www/cordova.js
----------------------------------------------------------------------
diff --git a/common/www/cordova.js b/common/www/cordova.js
index 4e04392..cccbf3a 100644
--- a/common/www/cordova.js
+++ b/common/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windowsphone
-// 2.7.0rc1-168-g1146c63
+// 3.0.0-dev-17-ge74c3f1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-168-g1146c63';
+var CORDOVA_JS_BUILD_LABEL = '3.0.0-dev-17-ge74c3f1';
// file: lib/scripts/require.js
var require,
@@ -1131,6 +1131,11 @@ function finishPluginLoading() {
function handlePluginsObject(path, moduleList) {
// Now inject the scripts.
var scriptCounter = moduleList.length;
+
+ if (!scriptCounter) {
+ onScriptLoadingComplete();
+ return;
+ }
function scriptLoadedCallback() {
if (!--scriptCounter) {
onScriptLoadingComplete(moduleList);
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/1668b445/wp7/template/CordovaWP7AppProj.csproj
----------------------------------------------------------------------
diff --git a/wp7/template/CordovaWP7AppProj.csproj b/wp7/template/CordovaWP7AppProj.csproj
index 3754935..4288543 100644
--- a/wp7/template/CordovaWP7AppProj.csproj
+++ b/wp7/template/CordovaWP7AppProj.csproj
@@ -123,15 +123,24 @@
</Page>
</ItemGroup>
<ItemGroup>
+ <Content Include="config.xml" />
+ <Content Include="www\cordova.js" />
+ <Content Include="www\index.html" />
+ <Content Include="www\css\index.css" />
+ <Content Include="www\js\index.js" />
+ <Content Include="www\img\logo.png" />
+ <Content Include="Images\appbar.back.rest.png" />
+ <Content Include="Images\appbar.close.rest.png" />
+ <Content Include="Images\appbar.feature.video.rest.png" />
+ <Content Include="Images\appbar.next.rest.png" />
+ <Content Include="Images\appbar.save.rest.png" />
+ <Content Include="Images\appbar.stop.rest.png" />
+ <Content Include="resources\notification-beep.wav" />
<None Include="cordova\lib\build.js" />
<None Include="cordova\lib\clean.js" />
<None Include="cordova\lib\deploy.js" />
<None Include="cordova\lib\log.js" />
<None Include="cordova\lib\target-list.js" />
- <Content Include="www\**" />
- <Content Include="config.xml" />
- <Content Include="Images\**" />
- <Content Include="resources\notification-beep.wav" />
<None Include="cordova\build.bat" />
<None Include="cordova\clean.bat" />
<None Include="cordova\lib\install-device.bat" />
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/1668b445/wp8/template/CordovaWP8AppProj.csproj
----------------------------------------------------------------------
diff --git a/wp8/template/CordovaWP8AppProj.csproj b/wp8/template/CordovaWP8AppProj.csproj
index 03c75db..c55fcff 100644
--- a/wp8/template/CordovaWP8AppProj.csproj
+++ b/wp8/template/CordovaWP8AppProj.csproj
@@ -161,15 +161,25 @@
</Page>
</ItemGroup>
<ItemGroup>
- <Content Include="www\**" />
+ <Content Include="config.xml" />
+ <Content Include="www\cordova.js" />
+ <Content Include="www\index.html" />
+ <Content Include="www\css\index.css" />
+ <Content Include="www\js\index.js" />
+ <Content Include="www\img\logo.png" />
+ <Content Include="config.xml" />
+ <Content Include="Images\appbar.back.rest.png" />
+ <Content Include="Images\appbar.close.rest.png" />
+ <Content Include="Images\appbar.feature.video.rest.png" />
+ <Content Include="Images\appbar.next.rest.png" />
+ <Content Include="Images\appbar.save.rest.png" />
+ <Content Include="Images\appbar.stop.rest.png" />
+ <Content Include="resources\notification-beep.wav" />
<None Include="cordova\lib\build.js" />
<None Include="cordova\lib\clean.js" />
<None Include="cordova\lib\deploy.js" />
<None Include="cordova\lib\log.js" />
<None Include="cordova\lib\target-list.js" />
- <Content Include="config.xml" />
- <Content Include="Images\**" />
- <Content Include="resources\notification-beep.wav" />
<None Include="cordova\build.bat" />
<None Include="cordova\clean.bat" />
<None Include="cordova\lib\install-device.bat" />