You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/09 03:55:28 UTC
[1/2] git commit: adding prepare namespace
Repository: cordova-plugman
Updated Branches:
refs/heads/browserify 4146171ff -> 909aa103a
adding prepare namespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/6387e611
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/6387e611
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/6387e611
Branch: refs/heads/browserify
Commit: 6387e611fe3e2b8be2ff906306e70d5331c3bf89
Parents: 4146171
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:37:27 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Apr 8 18:37:27 2014 -0700
----------------------------------------------------------------------
src/prepare.js | 14 ++++----------
src/util/prepare-namespace.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/6387e611/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index d8fc634..85be55a 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -23,6 +23,7 @@ var platform_modules = require('./platforms'),
path = require('path'),
config_changes = require('./util/config-changes'),
xml_helpers = require('./util/xml-helpers'),
+ prepareNamespace = require('./util/prepare-namespace'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
@@ -217,14 +218,10 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.clobbers = [];
}
obj.clobbers.push(child.attrib.target);
- /* FIXME: browserify guettho clobber */
+ //console.log(prepareNamespace(child.attrib.target, 'c'));
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').assignOrWrapInDeprecateGetter(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'c'),
'utf-8');
- /* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'merges') {
if (!obj.merges) {
obj.merges = [];
@@ -232,10 +229,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
obj.merges.push(child.attrib.target);
/* FIXME: browserify guettho clobber */
fs.appendFileSync(bScriptPath,
- util.format(
- "require('cordova/builder').recursiveMerge(window, '%s', module.exports);",
- child.attrib.target
- ),
+ prepareNamespace(child.attrib.target, 'm'),
'utf-8');
/* end browserify guettho clobber */
} else if (child.tag.toLowerCase() == 'runs') {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/6387e611/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
new file mode 100644
index 0000000..3c19d13
--- /dev/null
+++ b/src/util/prepare-namespace.js
@@ -0,0 +1,31 @@
+// FIXME this is extremely guettho
+module.exports = function(target, method) {
+ var lastDot = target.lastIndexOf('.');
+ var namespace = target.substr(0, lastDot);
+ var lastName = target.substr(lastDot + 1);
+ var props = target.split(".");
+ var code = "";
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
+
+ props.unshift('window');
+ var object = props.slice(0, props.length - 1).join('.');
+// code = "\n";
+ if(method === "c") {
+ return util.format(
+ "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ } else if(method === "m") {
+ return util.format(
+ "%s\n;require('cordova/builder').recursiveMerge(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ }
+}
[2/2] git commit: removing window from target
Posted by an...@apache.org.
removing window from target
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/909aa103
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/909aa103
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/909aa103
Branch: refs/heads/browserify
Commit: 909aa103a8c4a5b4d5cca5a6690fb573d1d41d29
Parents: 6387e61
Author: Anis Kadri <an...@apache.org>
Authored: Tue Apr 8 18:55:23 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Apr 8 18:55:23 2014 -0700
----------------------------------------------------------------------
src/util/prepare-namespace.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/909aa103/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 3c19d13..2cb9560 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,5 +1,8 @@
// FIXME this is extremely guettho
module.exports = function(target, method) {
+
+ target = target.replace(/^window(\.)?/, '');
+
var lastDot = target.lastIndexOf('.');
var namespace = target.substr(0, lastDot);
var lastName = target.substr(lastDot + 1);