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 2013/12/04 00:40:30 UTC

[1/2] js commit: CB-5316 Spell Cordova as a brand unless it's a command or script

Updated Branches:
  refs/heads/master 3d7f24c76 -> c13f84ff3


CB-5316 Spell Cordova as a brand unless it's a command or script


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

Branch: refs/heads/master
Commit: 59408787140f776131e4a0281020295050edaae8
Parents: 9740276
Author: Josh Soref <js...@blackberry.com>
Authored: Thu Nov 7 17:32:07 2013 -0500
Committer: Josh Soref <js...@blackberry.com>
Committed: Thu Nov 7 17:32:07 2013 -0500

----------------------------------------------------------------------
 README.md             | 2 +-
 build/gv-requires.js  | 2 +-
 lib/common/builder.js | 2 +-
 test/test.require.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59408787/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1d035b1..97da7ae 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ Build the .js file and drop it in as a replacement for cordova.js.
     {
       id:"atari",
       initialize:function(){
-        console.log('firing up cordova in my atari, yo.');
+        console.log('firing up Cordova in my Atari, yo.');
       },
       objects:{
         cordova:{

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59408787/build/gv-requires.js
----------------------------------------------------------------------
diff --git a/build/gv-requires.js b/build/gv-requires.js
index 864e429..fb7684d 100755
--- a/build/gv-requires.js
+++ b/build/gv-requires.js
@@ -28,7 +28,7 @@ process.chdir(path.join(__dirname, ".."))
 var platforms = getPlatforms()
 
 console.log("//-------------------------------------------------------")
-console.log("// graphviz .dot file for cordova requires by platform")
+console.log("// graphviz .dot file for Cordova requires by platform")
 console.log("// http://www.graphviz.org/")
 console.log("// ")
 console.log("//   - ./build/gv-requires.js > ~/tmp/requires.dot")

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59408787/lib/common/builder.js
----------------------------------------------------------------------
diff --git a/lib/common/builder.js b/lib/common/builder.js
index 4421121..826820d 100644
--- a/lib/common/builder.js
+++ b/lib/common/builder.js
@@ -85,7 +85,7 @@ function include(parent, objects, clobber, merge) {
                 include(result, obj.children, clobber, merge);
             }
         } catch(e) {
-            utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+            utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
         }
     });
 }

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/59408787/test/test.require.js
----------------------------------------------------------------------
diff --git a/test/test.require.js b/test/test.require.js
index 19d179d..c7e2285 100644
--- a/test/test.require.js
+++ b/test/test.require.js
@@ -20,7 +20,7 @@
 */
 
 describe("require + define", function () {
-    it("exist off of cordova", function () {
+    it("exists off of cordova", function () {
         var cordova = require('cordova');
         expect(cordova.require).toBeDefined();
         expect(cordova.define).toBeDefined();


[2/2] js commit: Merge branch 'cb_5316' of github.com:jsoref/cordova-js

Posted by st...@apache.org.
Merge branch 'cb_5316' of github.com:jsoref/cordova-js


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

Branch: refs/heads/master
Commit: c13f84ff38686702c0bd6efbd0c101591bb646be
Parents: 3d7f24c 5940878
Author: Steven Gill <st...@gmail.com>
Authored: Tue Dec 3 15:37:21 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Dec 3 15:37:21 2013 -0800

----------------------------------------------------------------------
 README.md             | 2 +-
 build/gv-requires.js  | 2 +-
 lib/common/builder.js | 2 +-
 test/test.require.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------