[06/13] js commit: [CB-4418] Remove final symbols.js file by folding it into bootstrap.

[ag...@apache.org]

[CB-4418] Remove final symbols.js file by folding it into bootstrap.


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

Branch: refs/heads/master
Commit: d82ed344241be042b7e159cfc161783016fccfce
Parents: 0df3426
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jul 30 10:28:53 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jul 30 10:28:53 2013 -0400

----------------------------------------------------------------------
 lib/common/symbols.js    | 27 ---------------------------
 lib/scripts/bootstrap.js |  4 ++++
 2 files changed, 4 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d82ed344/lib/common/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/symbols.js b/lib/common/symbols.js
deleted file mode 100644
index 573b7e9..0000000
--- a/lib/common/symbols.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-var modulemapper = require('cordova/modulemapper');
-
-// Use merges here in case others symbols files depend on this running first,
-// but fail to declare the dependency with a require().
-modulemapper.merges('cordova', 'cordova');
-modulemapper.clobbers('cordova/exec', 'cordova.exec');
-modulemapper.clobbers('cordova/exec', 'Cordova.exec');

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d82ed344/lib/scripts/bootstrap.js
----------------------------------------------------------------------
diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js
index 1d797e9..3a2481e 100644
--- a/lib/scripts/bootstrap.js
+++ b/lib/scripts/bootstrap.js
@@ -100,6 +100,10 @@
         channel.onNativeReady.fire();
     }
 
+    modulemapper.clobbers('cordova', 'cordova');
+    modulemapper.clobbers('cordova/exec', 'cordova.exec');
+    modulemapper.clobbers('cordova/exec', 'Cordova.exec');
+
     pluginloader.load(function() {
         channel.onPluginsReady.fire();
     });