Fixed #62

dist/css/ionic-ios7.css

@@ -182,7 +182,7 @@ sub {
 fieldset {
   margin: 0 2px;
   padding: 0.35em 0.625em 0.75em;
-  border: 1px solid #c0c0c0; }
+  border: 1px solid silver; }
 
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
@@ -1629,7 +1629,7 @@ input[type="file"] {
   line-height: 34px; }
 
 select {
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   background-color: white; }
 
 select[multiple],
@@ -1701,7 +1701,7 @@ input[type="checkbox"][readonly] {
   right: 20px;
   transition: 0.2s ease;
   transition-property: left, right;
-  transition-delay: 0s, .05s; }
+  transition-delay: 0s, 0.05s; }
 
 .toggle :checked + .track {
   /* When the toggle is "on" */
@@ -1716,7 +1716,7 @@ input[type="checkbox"][readonly] {
     right: 0;
     left: 20px;
     -webkit-transform: none;
-    transition-delay: .05s, 0s; }
+    transition-delay: 0.05s, 0s; }
 
 .item-radio {
   padding: 0; }
@@ -2001,7 +2001,7 @@ input[type="range"] {
     .button.button-icon:active, .button.button-icon.active {
       background: none;
       box-shadow: none;
-      text-shadow: 0px 0px 10px #fff; }
+      text-shadow: 0px 0px 10px white; }
   .button.block, .button.button-full {
     margin-top: 10px;
     margin-bottom: 10px; }
@@ -2359,9 +2359,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
+  -webkit-animation: spin 0.75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
-  animation: spin .75s linear infinite; }
+  animation: spin 0.75s linear infinite; }
   .icon-loading:before {
     content: "\e144"; }
 
@@ -2374,9 +2374,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
+  -webkit-animation: spin 0.75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
-  animation: spin .75s linear infinite; }
+  animation: spin 0.75s linear infinite; }
   .icon-refreshing:before {
     content: "\e144"; }
 

dist/css/ionic-scoped.css

@@ -1028,7 +1028,7 @@
   .ionic fieldset {
     margin: 0 2px;
     padding: 0.35em 0.625em 0.75em;
-    border: 1px solid #c0c0c0; }
+    border: 1px solid silver; }
   .ionic legend {
     padding: 0;
     /* 2 */
@@ -2286,7 +2286,7 @@
   .ionic input[type="file"] {
     line-height: 34px; }
   .ionic select {
-    border: 1px solid #ccc;
+    border: 1px solid #cccccc;
     background-color: white; }
   .ionic select[multiple],
   .ionic select[size] {
@@ -2335,7 +2335,7 @@
       border-radius: 50%;
       background: white;
       content: ' ';
-      transition: background-color .1s ease-in-out; }
+      transition: background-color 0.1s ease-in-out; }
   .ionic .checkbox input:after {
     position: absolute;
     top: 34%;
@@ -2348,7 +2348,7 @@
     border-right: 0;
     content: ' ';
     opacity: 0;
-    transition: opacity .05s ease-in-out;
+    transition: opacity 0.05s ease-in-out;
     -webkit-transform: rotate(-45deg);
     transform: rotate(-45deg); }
   .ionic .checkbox input:checked:before {
@@ -2700,7 +2700,7 @@
       .ionic .button.button-icon:active, .ionic .button.button-icon.active {
         background: none;
         box-shadow: none;
-        text-shadow: 0px 0px 10px #fff; }
+        text-shadow: 0px 0px 10px white; }
     .ionic .button.block, .ionic .button.button-full {
       margin-top: 10px;
       margin-bottom: 10px; }
@@ -2966,9 +2966,9 @@
     line-height: 1;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -webkit-animation: spin .75s linear infinite;
+    -webkit-animation: spin 0.75s linear infinite;
-    -moz-animation: spin .75s linear infinite;
+    -moz-animation: spin 0.75s linear infinite;
-    animation: spin .75s linear infinite; }
+    animation: spin 0.75s linear infinite; }
     .ionic .icon-loading:before {
       content: "\e144"; }
   .ionic .icon-refreshing {
@@ -2980,9 +2980,9 @@
     line-height: 1;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -webkit-animation: spin .75s linear infinite;
+    -webkit-animation: spin 0.75s linear infinite;
-    -moz-animation: spin .75s linear infinite;
+    -moz-animation: spin 0.75s linear infinite;
-    animation: spin .75s linear infinite; }
+    animation: spin 0.75s linear infinite; }
     .ionic .icon-refreshing:before {
       content: "\e144"; }
   .ionic .hidden,

dist/css/ionic.css

@@ -1261,7 +1261,7 @@ sub {
 fieldset {
   margin: 0 2px;
   padding: 0.35em 0.625em 0.75em;
-  border: 1px solid #c0c0c0; }
+  border: 1px solid silver; }
 
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
@@ -2772,7 +2772,7 @@ input[type="file"] {
   line-height: 34px; }
 
 select {
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   background-color: white; }
 
 select[multiple],
@@ -2827,7 +2827,7 @@ input[type="checkbox"][readonly] {
     border-radius: 50%;
     background: white;
     content: ' ';
-    transition: background-color .1s ease-in-out; }
+    transition: background-color 0.1s ease-in-out; }
 
 /* the checkmark within the box */
 .checkbox input:after {
@@ -2842,7 +2842,7 @@ input[type="checkbox"][readonly] {
   border-right: 0;
   content: ' ';
   opacity: 0;
-  transition: opacity .05s ease-in-out;
+  transition: opacity 0.05s ease-in-out;
   -webkit-transform: rotate(-45deg);
   transform: rotate(-45deg); }
 
@@ -3222,7 +3222,7 @@ input[type="range"] {
     .button.button-icon:active, .button.button-icon.active {
       background: none;
       box-shadow: none;
-      text-shadow: 0px 0px 10px #fff; }
+      text-shadow: 0px 0px 10px white; }
   .button.block, .button.button-full {
     margin-top: 10px;
     margin-bottom: 10px; }
@@ -3685,9 +3685,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
+  -webkit-animation: spin 0.75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
-  animation: spin .75s linear infinite; }
+  animation: spin 0.75s linear infinite; }
   .icon-loading:before {
     content: "\e144"; }
 
@@ -3700,9 +3700,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
+  -webkit-animation: spin 0.75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
-  animation: spin .75s linear infinite; }
+  animation: spin 0.75s linear infinite; }
   .icon-refreshing:before {
     content: "\e144"; }
 

js/controllers/navController.js

@@ -11,22 +11,22 @@
  * if the stack can be poppped to go back to the last view, and
  * it will handle updating the title of the nav bar and processing animations.
  */
-ionic.controllers.NavController = function(opts) {
+ionic.controllers.NavController = ionic.controllers.ViewController.inherit({
-  var _this = this;
+  initialize: function(opts) {
+    var _this = this;
 
-  this.navBar = opts.navBar;
+    this.navBar = opts.navBar;
-  this.content = opts.content;
+    this.content = opts.content;
-  this.controllers = opts.controllers || [];
+    this.controllers = opts.controllers || [];
 
-  this._updateNavBar();
+    this._updateNavBar();
 
-  // TODO: Is this the best way?
+    // TODO: Is this the best way?
-  this.navBar.shouldGoBack = function() {
+    this.navBar.shouldGoBack = function() {
-    _this.pop();
+      _this.pop();
-  };
+    };
-};
+  },
 
-ionic.controllers.NavController.prototype = {
   /**
    * @return {array} the array of controllers on the stack.
    */
@@ -151,5 +151,6 @@ ionic.controllers.NavController.prototype = {
       this.navBar.showBackButton(false);
     }
   }
-};
+});
+
 })(window.ionic);

js/controllers/routeController.js

@@ -17,21 +17,21 @@
   // Cached regex for removing a trailing slash.
   var trailingSlash = /\/$/;
 
-  ionic.controllers.RouteViewController = function(options) {
+  ionic.controllers.RouteViewController = ionic.controllers.ViewController.inherit({
-    this.options = options;
+    initialize: function(options) {
+      this.options = options;
 
-    this.root = this.options.root || '/';
+      this.root = this.options.root || '/';
-    this.root = ('/' + this.root + '/').replace(rootStripper, '/');
+      this.root = ('/' + this.root + '/').replace(rootStripper, '/');
 
-    this.handlers = [];
+      this.handlers = [];
 
-    this._bindEvents();
+      this._bindEvents();
 
-    this.location = window.location;
+      this.location = window.location;
-    this.history = window.history;
+      this.history = window.history;
-  };
+    },
 
-  ionic.controllers.RouteViewController.prototype = {
     when: function(route, callback) {
       var _this = this;
 
@@ -111,5 +111,5 @@
       }
       return matched;
     },
-  };
+  });
 })(window.ionic);

js/controllers/sideMenuController.js

@@ -7,30 +7,29 @@
    *
    * The right or left menu can be disabled or not used at all, if desired.
    */
-  ionic.controllers.SideMenuController = function(options) {
+  ionic.controllers.SideMenuController = ionic.controllers.ViewController.inherit({
-    var self = this;
+    initialize: function(options) {
+      var self = this;
 
-    this.left = options.left;
+      this.left = options.left;
-    this.right = options.right;
+      this.right = options.right;
-    this.content = options.content;
+      this.content = options.content;
-    this.dragThresholdX = options.dragThresholdX || 10;
+      this.dragThresholdX = options.dragThresholdX || 10;
         
-    this._rightShowing = false;
+      this._rightShowing = false;
-    this._leftShowing = false;
+      this._leftShowing = false;
-    this._isDragging = false;
+      this._isDragging = false;
 
-    if(this.content) {
+      if(this.content) {
-      this.content.onDrag = function(e) {
+        this.content.onDrag = function(e) {
-        self._handleDrag(e);
+          self._handleDrag(e);
-      };
+        };
 
-      this.content.endDrag = function(e) {
+        this.content.endDrag = function(e) {
-        self._endDrag(e);
+          self._endDrag(e);
-      };
+        };
-    }
+      }
-  };
+    },
-
-  ionic.controllers.SideMenuController.prototype = {
     /**
      * Set the content view controller if not passed in the constructor options.
      * 
@@ -263,6 +262,6 @@
         this.openAmount(this._offsetX + (this._lastX - this._startX));
       }
     }
-  };
+  });
 
 })(ionic);