You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2012/12/15 18:59:08 UTC

webworks commit: Remove webworks.js from project template since it will be injected by cordova.

Updated Branches:
  refs/heads/master d1a3abd90 -> 80e3ef1a5


Remove webworks.js from project template since it will be injected by cordova.


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

Branch: refs/heads/master
Commit: 80e3ef1a5223ae46e15146f5371510e7b30f260f
Parents: d1a3abd
Author: Bryan Higgins <bh...@rim.com>
Authored: Thu Dec 13 19:55:47 2012 -0500
Committer: Gord Tanner <gt...@gmail.com>
Committed: Sat Dec 15 09:36:06 2012 -0800

----------------------------------------------------------------------
 bin/templates/project/cordova/addWebworks |   57 ------------------------
 bin/templates/project/www/index.html      |    2 -
 javascript/cordova.blackberry.js          |    2 +-
 3 files changed, 1 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/80e3ef1a/bin/templates/project/cordova/addWebworks
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/addWebworks b/bin/templates/project/cordova/addWebworks
deleted file mode 100755
index 701dde3..0000000
--- a/bin/templates/project/cordova/addWebworks
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-#       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.
-
-ANT=$(which ant)
-
-if [ "$1" == "-h" -o "$1" == "-help" ]
-then
-  echo 'usage: addWebworks'
-  echo 'Automatically adds the webworks.js reference to all of your html files in the www/ folder'
-  echo 'Only relevant to qnx'
-  exit 0
-fi
-
-# cleanup after exit and/or on error
-function on_exit {
-    echo "\nDone!"
-    echo "Remember to build your qnx project to get the webworks.js file in your js directory!\n"
-}
-
-function on_error {
-    echo "An error occured."
-}
-
-# we do not want the script to silently fail
-trap on_error ERR
-trap on_exit EXIT
-
-echo "Finding files to add webworks to... \n"
-
-find www -name \*.html\* | while read fullpath
-do
-    if grep "webworks.js" $fullpath > /dev/null
-    then
-        echo "SKIPPING: "$fullpath
-    else
-        # i hate regex
-        jspath=$( dirname "$fullpath" ) ; jspath=${jspath#./www} ; jspath=${jspath//\/[a-zA-Z0-9]/../} ; jspath=${jspath//[a-zA-Z0-9]/}
-        sed -i "" '/<head>/ a\
-        <script type="text/javascript" src="local:///chrome/webworks.js"></script>' $fullpath  
-        echo "ADDING: "$fullpath
-    fi
-done

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/80e3ef1a/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/index.html b/bin/templates/project/www/index.html
index 0287b22..0146562 100644
--- a/bin/templates/project/www/index.html
+++ b/bin/templates/project/www/index.html
@@ -33,8 +33,6 @@
                 <p class="event received">Device is Ready</p>
             </div>
         </div>
-        <!-- Don't worry about local:///chrome/webworks.js if you're aren't developing for bb10 -->
-        <script type="text/javascript" src="local:///chrome/webworks.js"></script>  
         <script type="text/javascript" src="cordova-2.3.0rc2.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/80e3ef1a/javascript/cordova.blackberry.js
----------------------------------------------------------------------
diff --git a/javascript/cordova.blackberry.js b/javascript/cordova.blackberry.js
index 4bf2767..6e78d85 100644
--- a/javascript/cordova.blackberry.js
+++ b/javascript/cordova.blackberry.js
@@ -1,6 +1,6 @@
 // commit d8204cc0f8f1f2e72d95b4c811caa0635bb05a84
 
-// File generated at :: Fri Dec 14 2012 13:20:43 GMT-0800 (PST)
+// File generated at :: Sat Dec 15 2012 09:35:09 GMT-0800 (PST)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one