diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 3c0023f9e3..7d81d708c7 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -1194,7 +1194,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuContentTranslateX = 0;
- $scope.sideMenuCtrl = this;
+ $scope.sideMenuController = this;
})
.directive('sideMenu', function() {
@@ -1544,7 +1544,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
};
},
template:
- '' +
+ '' +
'' +
'' +
' {{title}}' +
diff --git a/examples/demos/toderp2/js/controllers.js b/examples/demos/toderp2/js/controllers.js
index 1453268be1..3eca85fa02 100644
--- a/examples/demos/toderp2/js/controllers.js
+++ b/examples/demos/toderp2/js/controllers.js
@@ -26,7 +26,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.loginForm = {
email: 'ihasmax@gmail.com',
- password: 'traintown'
+ password: ''
};
$scope.close = function() {
@@ -134,7 +134,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.selectProject = function(project) {
$scope.setActiveProject(project);
- $scope.sideMenuCtrl.close();
+ $scope.sideMenuController.close();
};
/**
@@ -162,7 +162,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.activeProject.title = newProject.title;
$scope.activeProject.user_id = newProject.user_id;
- $scope.sideMenuCtrl.close();
+ $scope.sideMenuController.close();
};
$scope.deleteProject = function(project) {
diff --git a/examples/starters/weather/directives.js b/examples/starters/weather/directives.js
index 19ad53a6ee..63f1732753 100644
--- a/examples/starters/weather/directives.js
+++ b/examples/starters/weather/directives.js
@@ -25,7 +25,11 @@ angular.module('ionic.weather.directives', [])
replace: true,
transclude: true,
template: '',
- link: function($scope, $element, $attr) {
+
+ compile: function(element, attr) {
+ console.log('SMALL COMPILED');
+ return function($scope, $element, $attr) {
+ console.log('SMALL LINKED');
// Delay so we are in the DOM and can calculate sizes
$timeout(function() {
@@ -38,6 +42,7 @@ angular.module('ionic.weather.directives', [])
angular.element(document.querySelector('.content')).css('-webkit-overflow-scrolling', 'touch');
}, 50);
});
+ }
}
}
})
diff --git a/examples/starters/weather/index.html b/examples/starters/weather/index.html
index 552b4265fa..606bee8081 100644
--- a/examples/starters/weather/index.html
+++ b/examples/starters/weather/index.html
@@ -9,10 +9,11 @@
-
-
-
-
+
+
+
+
+
@@ -20,6 +21,7 @@
+
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
index 637dd86fc2..2c1a7b798f 100644
--- a/js/ext/angular/src/directive/ionicSideMenu.js
+++ b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -33,7 +33,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuContentTranslateX = 0;
- $scope.sideMenuCtrl = this;
+ $scope.sideMenuController = this;
})
.directive('sideMenu', function() {
diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js
index 1c45a71522..965c06c10d 100644
--- a/js/ext/angular/src/directive/ionicTabBar.js
+++ b/js/ext/angular/src/directive/ionicTabBar.js
@@ -152,7 +152,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
};
},
template:
- '' +
+ '' +
'' +
'' +
' {{title}}' +
diff --git a/js/ext/angular/test/directive/ionicSideMenu.unit.js b/js/ext/angular/test/directive/ionicSideMenu.unit.js
index eb6894ed9b..21337f110b 100644
--- a/js/ext/angular/test/directive/ionicSideMenu.unit.js
+++ b/js/ext/angular/test/directive/ionicSideMenu.unit.js
@@ -13,6 +13,6 @@ describe('Ionic Angular Side Menu', function() {
it('Should init', function() {
var scope = el.scope();
- expect(scope.sideMenuCtrl).not.toBe(undefined);
+ expect(scope.sideMenuController).not.toBe(undefined);
});
});
diff --git a/js/ext/angular/test/navTest.html b/js/ext/angular/test/navTest.html
new file mode 100644
index 0000000000..5650ee5f70
--- /dev/null
+++ b/js/ext/angular/test/navTest.html
@@ -0,0 +1,60 @@
+
+
+
+ Nav Bars
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/js/ext/angular/test/sideMenu.html b/js/ext/angular/test/sideMenu.html
index 4e9434fbbb..1f92eb1c30 100644
--- a/js/ext/angular/test/sideMenu.html
+++ b/js/ext/angular/test/sideMenu.html
@@ -63,7 +63,7 @@
});
}
$scope.openLeft = function() {
- $scope.sideMenuCtrl.toggleLeft();
+ $scope.sideMenuController.toggleLeft();
};
});
diff --git a/js/ext/angular/test/tabs.html b/js/ext/angular/test/tabs.html
index 1e726f0e24..39426f4735 100644
--- a/js/ext/angular/test/tabs.html
+++ b/js/ext/angular/test/tabs.html
@@ -51,11 +51,11 @@
-
-
-