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

Change for #148

Browse Source
This commit is contained in:
Max Lynch
2013-11-17 14:51:05 -06:00
parent 097f8ce98a
commit 32673a2f3d
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24320,7 +24320,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuController = this; $scope.sideMenuController = this;
}) })
.directive('sideMenu', function() { .directive('sideMenus', function() {
return { return {
restrict: 'ECA', restrict: 'ECA',
controller: 'SideMenuCtrl', controller: 'SideMenuCtrl',
@ -24333,7 +24333,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
.directive('sideMenuContent', ['Gesture', function(Gesture) { .directive('sideMenuContent', ['Gesture', function(Gesture) {
return { return {
restrict: 'AC', restrict: 'AC',
require: '^sideMenu', require: '^sideMenus',
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) {
@ -24398,10 +24398,10 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
}]) }])
.directive('side', function() { .directive('sideMenu', function() {
return { return {
restrict: 'E', restrict: 'E',
require: '^sideMenu', require: '^sideMenus',
replace: true, replace: true,
transclude: true, transclude: true,
scope: true, scope: true,

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

@ -36,7 +36,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuController = this; $scope.sideMenuController = this;
}) })
.directive('sideMenu', function() { .directive('sideMenus', function() {
return { return {
restrict: 'ECA', restrict: 'ECA',
controller: 'SideMenuCtrl', controller: 'SideMenuCtrl',
@ -49,7 +49,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
.directive('sideMenuContent', ['Gesture', function(Gesture) { .directive('sideMenuContent', ['Gesture', function(Gesture) {
return { return {
restrict: 'AC', restrict: 'AC',
require: '^sideMenu', require: '^sideMenus',
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) {
@ -114,10 +114,10 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
}]) }])
.directive('side', function() { .directive('sideMenu', function() {
return { return {
restrict: 'E', restrict: 'E',
require: '^sideMenu', require: '^sideMenus',
replace: true, replace: true,
transclude: true, transclude: true,
scope: true, scope: true,

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

@ -13,7 +13,7 @@
<body> <body>
<div ng-controller="MenuCtrl"> <div ng-controller="MenuCtrl">
<side-menu> <side-menus>
<pane side-menu-content> <pane side-menu-content>
<header class="bar bar-header bar-assertive"> <header class="bar bar-header bar-assertive">
<button class="button button-icon" ng-click="openLeft()"><i class="icon ion-navicon"></i></button> <button class="button button-icon" ng-click="openLeft()"><i class="icon ion-navicon"></i></button>
@ -23,7 +23,7 @@
<h1>Content</h1> <h1>Content</h1>
</div> </div>
</pane> </pane>
<side side="left"> <side-menu side="left">
<header class="bar bar-header bar-assertive"> <header class="bar bar-header bar-assertive">
<h1 class="title">Left</h1> <h1 class="title">Left</h1>
</header> </header>
@ -34,8 +34,8 @@
</a> </a>
</ul> </ul>
</content> </content>
</side> </side-menu>
<side side="right"> <side-menu side="right">
<header class="bar bar-header bar-assertive"> <header class="bar bar-header bar-assertive">
<h1 class="title">Right</h1> <h1 class="title">Right</h1>
</header> </header>
@ -46,8 +46,8 @@
</a> </a>
</ul> </ul>
</content> </content>
</side>
</side-menu> </side-menu>
</side-menus>
</div> </div>
<script> <script>
angular.module('sideMenuTest', ['ionic']) angular.module('sideMenuTest', ['ionic'])