Updated to new Ionic

ionic-team · Aug 6, 2014 · b027e39 · b027e39
1 parent 695b780
commit b027e39
Show file tree

Hide file tree

Showing 50 changed files with 65,296 additions and 46,706 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*~
+.*.sw*
diff --git a/example/ionic.project b/example/ionic.project
@@ -0,0 +1,6 @@
+{
+  "name": "example",
+  "email": "",
+  "app_id": "",
+  "package_name": ""
+}
diff --git a/example/www/index.html b/example/www/index.html
@@ -12,20 +12,14 @@
     <link href="css/app.css" rel="stylesheet">
 
     <!-- angularjs scripts -->
-    <script src="lib/js/ionic.js"></script>
-    <script src="lib/js/angular/angular.js"></script>
-    <script src="lib/js/angular/angular-animate.js"></script>
-    <script src="lib/js/angular/angular-sanitize.js"></script>
-    <script src="lib/js/angular/angular-touch.js"></script>
-    <script src="lib/js/angular-ui/angular-ui-router.js"></script>
-    <script src="lib/js/ionic-angular.js"></script>
+    <script src="lib/js/ionic.bundle.js"></script>
 
     <!-- cordova script -->
     <script src="cordova.js"></script>
 
     <!-- your app's script -->
     <script src="js/app.js"></script>
-    <script src="js/ionic.cards.js"></script>
+    <script src="js/ionic.swipecards.js"></script>
     <script src="js/services.js"></script>
     <script src="js/controllers.js"></script>
   </head>
@@ -34,14 +28,14 @@
     'starter' is the name of this angular module (js/app.js)
   -->
   <body ng-app="starter" animation="slide-left-right-ios7" no-scroll>
-    <pane ng-controller="CardsCtrl">
-      <header-bar type="bar-transparent" title="'Help out'"></header-bar>
+    <ion-pane ng-controller="CardsCtrl">
+      <ion-header-bar type="bar-transparent" title="'Help out'"></ion-header-bar>
 
       <swipe-cards>
-        <swipe-card on-swipe="cardSwiped()" id="start-card">
+        <swipe-card on-card-swipe="cardSwiped()" id="start-card">
           Swipe down for a new card
         </swipe-card>
-        <swipe-card ng-repeat="card in cards" on-destroy="cardDestroyed($index)" on-swipe="cardSwiped($index)">
+        <swipe-card ng-repeat="card in cards" on-destroy="cardDestroyed($index)" on-card-swipe="cardSwiped($index)">
           <div ng-controller="CardCtrl">
             <div class="title">
               {{card.title}}
@@ -56,6 +50,6 @@
           </div>
         </swipe-card>
       </swipe-cards>
-    </pane>
+    </ion-pane>
   </body>
 </html>
diff --git a/example/www/js/app.js b/example/www/js/app.js
@@ -5,7 +5,7 @@
 // the 2nd parameter is an array of 'requires'
 // 'starter.services' is found in services.js
 // 'starter.controllers' is found in controllers.js
-angular.module('starter', ['ionic', 'ngTouch', 'ionic.contrib.ui.cards'])
+angular.module('starter', ['ionic', 'ionic.contrib.ui.cards'])
 
 
 .config(function($stateProvider, $urlRouterProvider) {

diff --git a/example/www/js/ionic.cards.js → example/www/js/ionic.swipecards.js b/example/www/js/ionic.cards.js → example/www/js/ionic.swipecards.js
@@ -208,15 +208,15 @@
         } else {
           self._transformOriginLeft();
         }
-        window.rAF(function() { self._doDragStart(e) });
+        ionic.requestAnimationFrame(function() { self._doDragStart(e) });
       }, this.el);
 
       ionic.onGesture('drag', function(e) {
-        window.rAF(function() { self._doDrag(e) });
+        ionic.requestAnimationFrame(function() { self._doDrag(e) });
       }, this.el);
 
       ionic.onGesture('dragend', function(e) {
-        window.rAF(function() { self._doDragEnd(e) });
+        ionic.requestAnimationFrame(function() { self._doDragEnd(e) });
       }, this.el);
     },
 
@@ -271,7 +271,7 @@
       replace: true,
       transclude: true,
       scope: {
-        onSwipe: '&',
+        onCardSwipe: '&',
         onDestroy: '&'
       },
       compile: function(element, attr) {
@@ -283,7 +283,7 @@
             el: el,
             onSwipe: function() {
               $timeout(function() {
-                $scope.onSwipe();
+                $scope.onCardSwipe();
               });
             },
             onDestroy: function() {