cordova no likely dynamic load of cordova.js. Wait for 2.0 to try again.

jrburke · Jul 16, 2012 · 4668ade · 4668ade
1 parent acb2813
commit 4668ade
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/code/www/index.html b/code/www/index.html
@@ -9,6 +9,28 @@
     <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="iphone.css" type="text/css" />
     -->
 
+    <!-- TODO: revisit dynamic loading of cordova.js when its 2.0 is released -->
+    <script>
+    (function () {
+        var pathRegExp = /(\/|^)env\/|\{env\}/,
+            value = 'web',
+            platform = navigator.platform.toLowerCase(),
+            ua = typeof navigator !== 'undefined' && navigator.userAgent;
+
+        //A device installation. Nothing says quality like UA sniffing.
+        //If you know of a better way to do this, speak up.
+        if (platform.indexOf('iphone') !== -1 ||
+                platform.indexOf('ipad') !== -1 ||
+                platform.indexOf('ipod') !== -1) {
+            value = 'ios';
+        } else if (/android/i.test(ua)) {
+            value = 'android';
+        }
+
+        document.write('<script src="js/lib/' + value + '/cordova.js">\<\/script>');
+    }());
+    </script>
+
     <script data-main="js/app" src="js/lib/require.js"></script>
 </head>
 <body>

diff --git a/code/www/js/app/main.js b/code/www/js/app/main.js
@@ -1,11 +1,10 @@
 
-/*global define, console, document, navigator */
+/*global define, console, document, navigator, location */
 
 define(function (require) {
     'use strict';
 
-    var $ = require('jquery'),
-        cordova = require('env!cordova');
+    var $ = require('jquery');
 
     //Dependencies that do not have a module value
     require('cordovaReload');

diff --git a/code/www/js/lib/env.js b/code/www/js/lib/env.js
@@ -15,16 +15,17 @@ define(function () {
 
     var pathRegExp = /(\/|^)env\/|\{env\}/,
         value = 'web',
+        platform = navigator.platform.toLowerCase(),
         ua = typeof navigator !== 'undefined' && navigator.userAgent;
 
-    if (typeof location !== 'undefined' && location.protocol === 'file:') {
-        //A device installation. Nothing says quality like UA sniffing.
-        //If you know of a better way to do this, speak up.
-        if (/iphone/i.test(ua)) {
-            value = 'ios';
-        } else if (/android/i.test(ua)) {
-            value = 'android';
-        }
+    //A device installation. Nothing says quality like UA sniffing.
+    //If you know of a better way to do this, speak up.
+    if (platform.indexOf('iphone') !== -1 ||
+            platform.indexOf('ipad') !== -1 ||
+            platform.indexOf('ipod') !== -1) {
+        value = 'ios';
+    } else if (/android/i.test(ua)) {
+        value = 'android';
     }
 
     function env() {

diff --git a/code/www/js/lib/web/cordova.js b/code/www/js/lib/web/cordova.js
@@ -2,7 +2,7 @@
 
 //Just a shim for some things set up by cordova, so the code can run in a
 //web browser.
-define(['jquery'], function ($) {
+(function () {
     'use strict';
 
     //document.addEventListener("deviceready"...
@@ -13,4 +13,4 @@ define(['jquery'], function ($) {
         };
     }
 
-});
+}());