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

Side menu cleanups for #25

Browse Source
This commit is contained in:
Max Lynch
2013-11-04 14:00:59 -06:00
parent bd8e0816a9
commit 67ef5e3e2f
3 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,20 +867,20 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuCtrl = this; $scope.sideMenuCtrl = this;
}) })
.directive('sideMenus', function() { .directive('sideMenu', function() {
return { return {
restrict: 'ECA', restrict: 'ECA',
controller: 'SideMenuCtrl', controller: 'SideMenuCtrl',
replace: true, replace: true,
transclude: true, transclude: true,
template: '<div ng-transclude></div>' template: '<div class="pane" ng-transclude></div>'
}; };
}) })
.directive('sideMenuContent', ['Gesture', function(Gesture) { .directive('sideMenuContent', ['Gesture', function(Gesture) {
return { return {
restrict: 'CA', restrict: 'AC',
require: '^sideMenus', require: '^sideMenu',
scope: true, scope: true,
compile: function(element, attr, transclude) { compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
@ -923,7 +923,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
.directive('menu', function() { .directive('menu', function() {
return { return {
restrict: 'E', restrict: 'E',
require: '^sideMenus', require: '^sideMenu',
replace: true, replace: true,
transclude: true, transclude: true,
scope: { scope: {

10
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@ -45,20 +45,20 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuCtrl = this; $scope.sideMenuCtrl = this;
}) })
.directive('sideMenus', function() { .directive('sideMenu', function() {
return { return {
restrict: 'ECA', restrict: 'ECA',
controller: 'SideMenuCtrl', controller: 'SideMenuCtrl',
replace: true, replace: true,
transclude: true, transclude: true,
template: '<div ng-transclude></div>' template: '<div class="pane" ng-transclude></div>'
}; };
}) })
.directive('sideMenuContent', ['Gesture', function(Gesture) { .directive('sideMenuContent', ['Gesture', function(Gesture) {
return { return {
restrict: 'CA', restrict: 'AC',
require: '^sideMenus', require: '^sideMenu',
scope: true, scope: true,
compile: function(element, attr, transclude) { compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
@ -101,7 +101,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
.directive('menu', function() { .directive('menu', function() {
return { return {
restrict: 'E', restrict: 'E',
require: '^sideMenus', require: '^sideMenu',
replace: true, replace: true,
transclude: true, transclude: true,
scope: { scope: {

10
js/ext/angular/test/sideMenu.html
View File

@ -13,11 +13,11 @@
</head> </head>
<body> <body>
<side-menus ng-controller="MenuCtrl"> <div ng-controller="MenuCtrl">
<side-menu>
<pane side-menu-content> <pane side-menu-content>
<header class="bar bar-header bar-dark"> <header class="bar bar-header bar-dark">
<a href="#" class="button" ng-click="openLeft()"><i class="icon-reorder"></i></a> <button class="button" ng-click="openLeft()"><i class="icon-reorder"></i></button>
<h1 class="title">Slide me</h1> <h1 class="title">Slide me</h1>
</header> </header>
<div class="content has-header"> <div class="content has-header">
@ -35,7 +35,8 @@
<menu side="right"> <menu side="right">
<h2>Items</h2> <h2>Items</h2>
</menu> </menu>
</side-menus> </side-menu>
</div>
<script src="../../../../dist/js/ionic.js"></script> <script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script> <script src="../../../../dist/js/ionic-angular.js"></script>
<script> <script>
@ -43,6 +44,7 @@
.controller('MenuCtrl', function($scope) { .controller('MenuCtrl', function($scope) {
$scope.openLeft = function() { $scope.openLeft = function() {
debugger;
$scope.sideMenuCtrl.toggleLeft(); $scope.sideMenuCtrl.toggleLeft();
}; };
}); });