Progress on #37

This commit is contained in:
Max Lynch
2013-10-15 14:33:34 -05:00
parent bb2ec72053
commit 6ac2cd3797
32 changed files with 250 additions and 143 deletions

View File

@ -1,3 +1,6 @@
(function() {
'use strict';
angular.module('ionic.ui.actionSheet', [])
.directive('actionSheet', function() {
@ -22,5 +25,7 @@ angular.module('ionic.ui.actionSheet', [])
'<button class="button" ng-click="cancel()">{{cancelText}}</button>' +
'</div>' +
'</div>'
}
};
});
})();

View File

@ -1,3 +1,6 @@
(function() {
'use strict';
angular.module('ionic.ui.checkbox', [])
@ -36,5 +39,7 @@ angular.module('ionic.ui.checkbox', [])
$scope.checkbox.val(ngModel.$viewValue);
};
}
}
})
};
});
})();

View File

@ -1,3 +1,6 @@
(function() {
'use strict';
angular.module('ionic.ui.content', [])
// The content directive is a core scrollable content area
@ -24,7 +27,8 @@ angular.module('ionic.ui.content', [])
c.addClass('has-tabs');
}
c.append(transclude($scope));
}
};
}
}
})
};
});
})();

View File

@ -1,3 +1,6 @@
(function() {
'use strict';
angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
.directive('listItem', function() {
@ -6,7 +9,6 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
require: '^list',
replace: true,
transclude: true,
scope: true,
scope: {
item: '=',
onSelect: '&',
@ -42,7 +44,7 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
$scope.isEditing = v;
});
}
}
};
})
.directive('list', function() {
@ -78,7 +80,9 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
if(attr.animation) {
$element.addClass(attr.animation);
}
}
};
}
}
})
};
});
})();

View File

@ -1,3 +1,6 @@
(function() {
'use strict';
angular.module('ionic.ui.nav', ['ionic.service'])
.controller('NavCtrl', ['$scope', '$element', '$compile', 'TemplateLoader', function($scope, $element, $compile, TemplateLoader) {
@ -16,7 +19,7 @@ angular.module('ionic.ui.nav', ['ionic.service'])
$element.append(cloned);
});
});
}
};
ionic.controllers.NavController.call(this, {
content: {
@ -53,7 +56,7 @@ angular.module('ionic.ui.nav', ['ionic.service'])
controller: 'NavCtrl',
//templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html',
template: '<div class="view" ng-transclude></div>',
}
};
})
.directive('navBar', function() {
@ -70,9 +73,9 @@ angular.module('ionic.ui.nav', ['ionic.service'])
scope.navController = navCtrl;
scope.goBack = function() {
navCtrl.pop();
}
};
}
}
};
})
.directive('navContent', function() {
@ -101,5 +104,7 @@ angular.module('ionic.ui.nav', ['ionic.service'])
}
});
}
}
};
});
})();

View File

@ -1,5 +1,19 @@
angular.module('ionic.ui.sideMenu', [])
(function() {
'use strict';
/**
* @description
* The sideMenuCtrl lets you quickly have a draggable side
* left and/or right menu, which a center content area.
*/
angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
/**
* The internal controller for the side menu controller. This
* extends our core Ionic side menu controller and exposes
* some side menu stuff on the current scope.
*/
.controller('SideMenuCtrl', function($scope) {
var _this = this;
@ -35,21 +49,22 @@ angular.module('ionic.ui.sideMenu', [])
return {
restrict: 'CA',
controller: 'SideMenuCtrl',
}
};
})
.directive('sideMenuContent', function() {
.directive('sideMenuContent', ['Gesture', function(Gesture) {
return {
restrict: 'CA',
require: '^sideMenuCtrl',
scope: true,
compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) {
window.ionic.onGesture('drag', function(e) {
Gesture.on('drag', function(e) {
sideMenuCtrl._handleDrag(e);
}, $element[0]);
window.ionic.onGesture('release', function(e) {
Gesture.on('release', function(e) {
sideMenuCtrl._endDrag(e);
}, $element[0]);
@ -76,8 +91,8 @@ angular.module('ionic.ui.sideMenu', [])
});
};
}
}
})
};
}])
.directive('menu', function() {
@ -100,5 +115,6 @@ angular.module('ionic.ui.sideMenu', [])
$element.append(transclude($scope));
};
}
}
})
};
});
})();

View File

@ -38,7 +38,7 @@ angular.module('ionic.ui.tabs', [])
return function($scope, $element, $attr) {
};
}
}
};
})
// Generic controller directive
@ -63,7 +63,7 @@ angular.module('ionic.ui.tabs', [])
scope.iconOff = attrs.iconOff;
tabsCtrl.addController(scope);
}
}
};
})
@ -77,7 +77,7 @@ angular.module('ionic.ui.tabs', [])
template: '<div class="tabs tabs-primary">' +
'<tab-item title="{{controller.title}}" icon="{{controller.icon}}" icon-on="{{controller.iconOn}}" icon-off="{{controller.iconOff}}" active="controller.isVisible" index="$index" ng-repeat="controller in controllers"></tab-item>' +
'</div>'
}
};
})
.directive('tabItem', function() {
@ -105,5 +105,5 @@ angular.module('ionic.ui.tabs', [])
'<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +
'</a>'
}
};
});

View File

@ -44,5 +44,5 @@ angular.module('ionic.ui.toggle', [])
$scope.toggle.val(ngModel.$viewValue);
};
}
}
})
};
});

View File

@ -19,7 +19,7 @@ angular.module('ionic.service.actionSheet', ['ionic.service', 'ionic.ui.actionSh
scope.sheet.hide();
//scope.$destroy();
opts.cancel();
}
};
scope.buttonClicked = function(index) {
// Check if the button click event returned true, which means
@ -37,17 +37,17 @@ angular.module('ionic.service.actionSheet', ['ionic.service', 'ionic.ui.actionSh
scope.sheet.hide();
//scope.$destroy();
}
}
};
// Compile the template
var element = $compile('<action-sheet buttons="buttons"></action-sheet>')(scope);
var scope = element.scope();
var s = element.scope();
$document[0].body.appendChild(element[0]);
var sheet = new ionic.views.ActionSheet({el: element[0] });
scope.sheet = sheet;
s.sheet = sheet;
sheet.show();

View File

@ -0,0 +1,9 @@
angular.module('ionic.service.gesture', [])
.factory('Gesture', [function() {
return {
on: function(eventType, cb, element) {
return window.ionic.onGesture(eventType, cb, element);
}
};
}]);

View File

@ -11,5 +11,5 @@ angular.module('ionic.service', [])
return deferred.promise;
}
}
};
}]);

View File

@ -91,4 +91,4 @@ describe('Tab Item directive', function() {
a.click();
expect(scope.selectTab).toHaveBeenCalled();
});
})
});