Lots of cleanup. Fixed #25, progress on #68

This commit is contained in:
Max Lynch
2013-11-04 12:37:42 -06:00
parent 8cb701a3da
commit bd8e0816a9
27 changed files with 133 additions and 1420 deletions

View File

@ -3,6 +3,15 @@
angular.module('ionic.ui.content', [])
.directive('pane', function() {
return {
restrict: 'E',
replace: true,
transclude: true,
template: '<div class="pane" ng-transclude></div>'
}
})
// The content directive is a core scrollable content area
// that is part of many View hierarchies
.directive('content', function() {

View File

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

View File

@ -13,16 +13,17 @@
</head>
<body>
<div side-menu-ctrl>
<div class="full-section" side-menu-content>
<side-menus ng-controller="MenuCtrl">
<pane side-menu-content>
<header class="bar bar-header bar-dark">
<a href="#" class="button"><i class="icon-reorder"></i></a>
<a href="#" class="button" ng-click="openLeft()"><i class="icon-reorder"></i></a>
<h1 class="title">Slide me</h1>
</header>
<div class="content has-header">
<h1>Slide me side to side!</h1>
</div>
</div>
</pane>
<menu side="left">
<h2>Left</h2>
<ul class="list">
@ -34,11 +35,17 @@
<menu side="right">
<h2>Items</h2>
</menu>
</div>
</side-menus>
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
<script>
angular.module('sideMenuTest', ['ionic.ui.sideMenu'])
angular.module('sideMenuTest', ['ionic'])
.controller('MenuCtrl', function($scope) {
$scope.openLeft = function() {
$scope.sideMenuCtrl.toggleLeft();
};
});
/*
var Controller = function(opts) {

View File

@ -13,8 +13,8 @@
</head>
<body>
<side-menu-controller>
<div class="full-section" side-menu-content>
<side-menus>
<pane side-menu-content>
<header class="bar bar-header bar-dark">
<a href="#" class="button"><i class="icon-reorder"></i></a>
<h1 class="title">Slide me</h1>
@ -22,7 +22,7 @@
<div class="content has-header">
<h1>Slide me side to side!</h1>
</div>
</div>
</pane>
<menu side="left">
<h2>Left</h2>
<ul class="list">
@ -67,7 +67,7 @@
</div>
</tab-controller>
</menu>
</side-menu-controller>
</side-menus>
<script src="../../../../dist/ionic.js"></script>
<script src="../src/directive/ionicContent.js"></script>
<script src="../src/directive/ionicSideMenu.js"></script>