You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/08/25 05:05:39 UTC

js commit: Revert "CB-13163: fix using relative paths in calls to require."

Repository: cordova-js
Updated Branches:
  refs/heads/master 5a1bffcf4 -> f623343b9


Revert "CB-13163: fix using relative paths in calls to require."

This reverts commit 65fd0f61cca4d979e653ab5cf2dbc32b50416ba9.


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/f623343b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/f623343b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/f623343b

Branch: refs/heads/master
Commit: f623343b9ff11fbe7c72d319932cc1fd3fdafed2
Parents: 5a1bffc
Author: Steve Gill <st...@gmail.com>
Authored: Thu Aug 24 17:34:13 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Aug 24 17:34:13 2017 -0700

----------------------------------------------------------------------
 src/scripts/require.js |  2 +-
 test/test.require.js   | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f623343b/src/scripts/require.js
----------------------------------------------------------------------
diff --git a/src/scripts/require.js b/src/scripts/require.js
index 8bf5848..93d01c4 100644
--- a/src/scripts/require.js
+++ b/src/scripts/require.js
@@ -31,7 +31,7 @@ var require,
         requireStack = [],
     // Map of module ID -> index into requireStack of modules currently being built.
         inProgressModules = {},
-        SEPARATOR = "/";
+        SEPARATOR = ".";
 
 
 

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f623343b/test/test.require.js
----------------------------------------------------------------------
diff --git a/test/test.require.js b/test/test.require.js
index 1f1724f..c7e2285 100644
--- a/test/test.require.js
+++ b/test/test.require.js
@@ -145,15 +145,5 @@ describe("require + define", function () {
             define("a", factory);
             require("a");
         });
-
-        it("can handle multiple defined modules that use relative require paths", function () {
-            define("plugin/ios/foo", function (require, exports, module) {
-                module.exports = require("./bar") * 2;
-            });
-            define("plugin/ios/bar", function (require, exports, module) {
-                module.exports = 2;
-            });
-            expect(require("plugin/ios/foo")).toEqual(4);
-        });
     });
 });


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org