javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

More Nav WIP

Browse Source
This commit is contained in:
Max Lynch
2013-11-01 00:36:53 -05:00
parent ced8ac3dc1
commit 4b0a6ac7af
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/js/ionic-angular.js vendored
View File

@ -585,7 +585,6 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
*/ */
this.pushFromTemplate = function(templateUrl) { this.pushFromTemplate = function(templateUrl) {
var childScope = $scope.$new(); var childScope = $scope.$new();
childScope.isVisible = true;
// Load the given template // Load the given template
TemplateLoader.load(templateUrl).then(function(templateString) { TemplateLoader.load(templateUrl).then(function(templateString) {
@ -650,6 +649,8 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
return function($scope, $element, $attr, navCtrl) { return function($scope, $element, $attr, navCtrl) {
var lastParent, lastIndex, childScope, childElement; var lastParent, lastIndex, childScope, childElement;
$scope.isVisible = true;
$scope.$watch('isVisible', function(value) { $scope.$watch('isVisible', function(value) {
// Taken from ngIf // Taken from ngIf
if(childElement) { if(childElement) {
@ -662,7 +663,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
} }
if(value) { if(value) {
childScope = $scope; childScope = $scope.$new();
transclude(childScope, function(clone) { transclude(childScope, function(clone) {
childElement = clone; childElement = clone;

5
js/ext/angular/src/directive/ionicNav.js vendored
View File

@ -40,7 +40,6 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
*/ */
this.pushFromTemplate = function(templateUrl) { this.pushFromTemplate = function(templateUrl) {
var childScope = $scope.$new(); var childScope = $scope.$new();
childScope.isVisible = true;
// Load the given template // Load the given template
TemplateLoader.load(templateUrl).then(function(templateString) { TemplateLoader.load(templateUrl).then(function(templateString) {
@ -105,6 +104,8 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
return function($scope, $element, $attr, navCtrl) { return function($scope, $element, $attr, navCtrl) {
var lastParent, lastIndex, childScope, childElement; var lastParent, lastIndex, childScope, childElement;
$scope.isVisible = true;
$scope.$watch('isVisible', function(value) { $scope.$watch('isVisible', function(value) {
// Taken from ngIf // Taken from ngIf
if(childElement) { if(childElement) {
@ -117,7 +118,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
} }
if(value) { if(value) {
childScope = $scope; childScope = $scope.$new();
transclude(childScope, function(clone) { transclude(childScope, function(clone) {
childElement = clone; childElement = clone;

5
js/ext/angular/test/nav.html
View File

@ -73,6 +73,11 @@
.controller('CatsCtrl', function($scope, $compile, $element) { .controller('CatsCtrl', function($scope, $compile, $element) {
console.log('Cats', $element); console.log('Cats', $element);
var items = [];
for(var i = 0; i < 100; i++) {
items.push({});
}
$scope.items = items;
$scope.goNext = function() { $scope.goNext = function() {
$scope.navController.pushFromTemplate('page.html'); $scope.navController.pushFromTemplate('page.html');
}; };