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

asdf

Browse Source
This commit is contained in:
Max Lynch
2013-11-01 15:48:47 -05:00
parent 565b050003 e8bd9a5dee
commit f5ff231420
22 changed files with 692 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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) {
var childScope = $scope.$new();
childScope.isVisible = true;
// Load the given template
TemplateLoader.load(templateUrl).then(function(templateString) {
@ -123,13 +122,14 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
};
return {
restrict: 'ECA',
restrict: 'CA',
require: '^navs',
transclude: 'element',
compile: function(element, attr, transclude) {
return function($scope, $element, $attr, navCtrl) {
var lastParent, lastIndex, childScope, childElement;
<<<<<<< HEAD
$scope.title = $attr.title;
$scope.slideAnimation = $attr.slideAnimation || '';
@ -143,6 +143,9 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
// Push this controller onto the stack
$scope.pushController($scope, $element);
=======
$scope.isVisible = true;
>>>>>>> e8bd9a5dee77d29b746115546a51b1a4a3d46246
$scope.$watch('isVisible', function(value) {
// Taken from ngIf
@ -158,7 +161,10 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
// Check if this is visible, and if so, create it and show it
if(value) {
childScope = $scope.$new();
<<<<<<< HEAD
=======
>>>>>>> e8bd9a5dee77d29b746115546a51b1a4a3d46246
transclude(childScope, function(clone) {
childElement = clone;