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 2015/03/19 19:27:06 UTC
[1/2] js commit: Verify that window.cordova does not already exist
and throw error if it does
Repository: cordova-js
Updated Branches:
refs/heads/master 74c6c8936 -> b4af1c5ec
Verify that window.cordova does not already exist and throw error if it does
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/59bd041f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/59bd041f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/59bd041f
Branch: refs/heads/master
Commit: 59bd041f7f8eedad937ad211c6b714901b032ec5
Parents: 214f9d3
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Mar 16 14:42:47 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Mar 16 14:42:47 2015 -0700
----------------------------------------------------------------------
src/cordova.js | 2 ++
src/cordova_b.js | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59bd041f/src/cordova.js
----------------------------------------------------------------------
diff --git a/src/cordova.js b/src/cordova.js
index da3fdbe..1f1b92d 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -19,6 +19,8 @@
*
*/
+if ("cordova" in window) { throw new Error("cordova already defined"); };
+
var channel = require('cordova/channel');
var platform = require('cordova/platform');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59bd041f/src/cordova_b.js
----------------------------------------------------------------------
diff --git a/src/cordova_b.js b/src/cordova_b.js
index 71d546b..82facf5 100644
--- a/src/cordova_b.js
+++ b/src/cordova_b.js
@@ -19,6 +19,8 @@
*
*/
+if ("cordova" in window) { throw new Error("cordova already defined"); };
+
/*global symbolList*/
var channel = require('cordova/channel');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] js commit: Merge CB-7992 purplecabbage/cordova-js This closes
#106
Posted by pu...@apache.org.
Merge CB-7992 purplecabbage/cordova-js This closes #106
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/b4af1c5e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/b4af1c5e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/b4af1c5e
Branch: refs/heads/master
Commit: b4af1c5ec477dd98cd651932ea6df6d46705d7f9
Parents: 74c6c89 59bd041
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Mar 19 11:25:02 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Mar 19 11:26:42 2015 -0700
----------------------------------------------------------------------
src/cordova.js | 2 ++
src/cordova_b.js | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org