update phonegap and angular

thewildpendulum · Nov 3, 2013 · f4bbbd8 · f4bbbd8
1 parent 2db1483
commit f4bbbd8
Show file tree

Hide file tree

Showing 10 changed files with 9,917 additions and 13,274 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@ angular-phonegap-seed
 
 A barebones seed project for getting started with [PhoneGap](phonegap.com) and [AngularJS](http://angularjs.org/) (with routing!)
 
-Built using [PhoneGap-CLI](https://github.com/mwbrooks/phonegap-cli/):
-* Target: iOS 6
-* Cordova: 2.9.0
-* Angular: 1.1.5
+Built using [PhoneGap-CLI](https://github.com/phonegap/phonegap-cli):
+* Target: iOS 7.0.3
+* Cordova: 3.1.0
+* Angular: 1.2.0-rc.3
 
 This project also includes a service for wrapping calls to Cordova APIs as presented by Brian Ford in [this awesome blog post](http://briantford.com/blog/angular-phonegap.html).
 
@@ -28,9 +28,8 @@ Directory structure:
         - index.js
         - services.js
     /lib
-        - angular-1.1.5.js
-        - angular-1.1.5.min.js
-        - cordova.js
+        - angular-1.2.0-rc3.js
+        - angular-1.2.0-rc3.min.js
     /partials
         - main.html
         - view.html

diff --git a/config.xml b/config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.phonegap.angular-phonegap-seed" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:gap="http://phonegap.com/ns/1.0">
-    <name>Angular-PhoneGap-Seed</name>
+<widget id="com.phonegap.helloworld" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:gap="http://phonegap.com/ns/1.0">
+    <name>HelloWorld</name>
     <description>
         Hello World sample application that responds to the deviceready event.
     </description>
@@ -9,7 +9,6 @@
     </author>
     <feature name="http://api.phonegap.com/1.0/device" />
     <preference name="permissions" value="none" />
-    <preference name="phonegap-version" value="2.9.0" />
     <preference name="orientation" value="default" />
     <preference name="target-device" value="universal" />
     <preference name="fullscreen" value="true" />
@@ -49,4 +48,5 @@
     <gap:splash gap:platform="ios" height="768" src="res/screen/ios/screen-ipad-landscape.png" width="1024" />
     <gap:splash gap:platform="winphone" src="res/screen/windows-phone/screen-portrait.jpg" />
     <access origin="http://127.0.0.1*" />
+    <content src="index.html" />
 </widget>
diff --git a/index.html b/index.html
@@ -18,30 +18,33 @@
     under the License.
 -->
 <html ng-app="App">
-<head>
-    <meta charset="utf-8" />
-    <meta name="format-detection" content="telephone=no" />
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
-    <link rel="stylesheet" type="text/css" href="css/index.css" />
-    <title>Angular PhoneGap Seed</title>
-</head>
-<body>
-    <a href="#/">Main View</a>
-    <a href="#/view">New View</a>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="format-detection" content="telephone=no" />
+        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
+        <link rel="stylesheet" type="text/css" href="css/index.css" />
+        <title>Angular PhoneGap Seed</title>
+    </head>
+    <body>
+        <div class="app-body">
+            <a href="#/">Main View</a>
+            <a href="#/view">New View</a>
 
-    <div ng-view></div>
+            <div ng-view></div>
+        </div>
 
-    <!-- Libs -->
-    <script type="text/javascript" src="lib/cordova.js"></script>
-    <script type="text/javascript" src="lib/angular-1.1.5.js"></script>
+        <!-- Libs -->
+        <script type="text/javascript" src="phonegap.js"></script>
+        <script type="text/javascript" src="lib/angular-1.2.0-rc3.js"></script>
+        <script type="text/javascript" src="lib/angular-route.js"></script>
 
-    <!-- App -->
-    <script type="text/javascript" src="js/index.js"></script>
-    <script type="text/javascript" src="js/app.js"></script>
-    <script type="text/javascript" src="js/services.js"></script>
-    <script type="text/javascript" src="js/controllers.js"></script>
-    <script type="text/javascript">
-        app.initialize();
-    </script>
-</body>
+        <!-- App -->
+        <script type="text/javascript" src="js/index.js"></script>
+        <script type="text/javascript" src="js/app.js"></script>
+        <script type="text/javascript" src="js/services.js"></script>
+        <script type="text/javascript" src="js/controllers.js"></script>
+        <script type="text/javascript">
+            app.initialize();
+        </script>
+    </body>
 </html>
diff --git a/js/app.js b/js/app.js
@@ -1,8 +1,8 @@
-angular.module('App', ['App.services', 'App.controllers'])
-    .config(['$compileProvider', function ($compileProvider) {
-        $compileProvider.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel):/);
-    }])
-    .config(['$routeProvider', function ($routeProvider) {
+angular.module('App', ['ngRoute', 'App.services', 'App.controllers'])
+    // .config(['$compileProvider', function ($compileProvider) {
+    //     $compileProvider.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel):/);
+    // }])
+    .config(function ($routeProvider) {
         $routeProvider
         .when('/', {
             controller: 'MainCtrl',
@@ -13,4 +13,4 @@ angular.module('App', ['App.services', 'App.controllers'])
             templateUrl: 'partials/view.html'
         })
         .otherwise({redirectTo: '/'});
-    }]);
+    });