javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update ion-side-menu-content to be element everywhere

Browse Source
This commit is contained in:
Andy Joslin
2014-03-26 07:50:43 -06:00
parent dd969e7e8b
commit 270d2bfea1
9 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,12 +37,12 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
* ```html
* <body ng-controller="MainCtrl">
* <ion-side-menus>
* <ion-pane ion-side-menu-content>
* <ion-side-menu-content>
* Content!
* <button ng-click="toggleLeftSideMenu()">
* Toggle Left Side Menu
* </button>
* </ion-pane>
* </ion-side-menu-content>
* <ion-side-menu side="left">
* Left Menu!
* <ion-side-menu>
@@ -133,7 +133,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
* <ion-side-menus>
* <!-- Center content -->
* <ion-side-menu-content ng-controller="ContentController">
* </io-side-menu-content>
* </ion-side-menu-content>
*
* <!-- Left menu -->
* <ion-side-menu side="left">

2
js/ext/angular/test/map.html
View File

@@ -16,7 +16,7 @@
<script id="main.html" type="text/ng-template">
<ion-side-menus>
<!-- Center content -->
<ion-pane ion-side-menu-content drag-content="false">
<ion-side-menu-content drag-content="false">
<ion-nav-bar class="nav-title-slide-ios7 bar-stable">
<ion-nav-back-button class="button-icon ion-arrow-left-c"></ion-nav-back-button>
</ion-nav-back-button>

2
js/ext/angular/test/overflow.html
View File

@@ -50,7 +50,7 @@
</head>
<body ng-controller="AppCtrl">
<ion-side-menus>
<ion-pane ion-side-menu-content>
<ion-side-menu-content>
<ion-header-bar class="bar-primary">
<h1 class="title">Title</h1>
</ion-header-bar>

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

@@ -12,7 +12,7 @@
<ion-side-menus>
<ion-pane ion-side-menu-content>
<ion-side-menu-content>
<header class="bar bar-header bar-positive">
<button class="button button-icon ion-navicon" ng-click="toggleLeft()"></button>
<h1 class="title">Slide me</h1>
@@ -26,7 +26,7 @@
<ion-item>Sup</ion-item>
</ion-list>
</ion-content>
</ion-pane>
</ion-side-menu-content>
<ion-side-menu side="left" width="$root.menuWidth || 270" ng-controller="LeftCtrl">
<header class="bar bar-header bar-assertive">

4
js/ext/angular/test/sideMenu2.html
View File

@@ -15,12 +15,12 @@
<script id="event-menu.html" type="text/ng-template">
<ion-side-menus>
<ion-pane ion-side-menu-content>
<ion-side-menu-content>
<ion-nav-bar class="bar-positive">
<ion-nav-back-button class="button-icon icon ion-arrow-left-c"></ion-nav-back-button>
</ion-nav-bar>
<ion-nav-view name="menuContent" animation="slide-left-right"></ion-nav-view>
</ion-pane>
</ion-side-menu-content>
<ion-side-menu side="left">
<header class="bar bar-header bar-assertive">

4
js/ext/angular/test/slideBox.html
View File

@@ -44,7 +44,7 @@
<div ng-controller="SlideCtrl">
<ion-side-menus>
<ion-pane ion-side-menu-content>
<ion-side-menu-content>
<ion-header-bar left-buttons="leftButtons" right-buttons="rightButtons" title=""></ion-header-bar>
<ion-slide-box on-slide-changed="slideChanged(index)">
<ion-slide ng-controller="FirstSlideCtrl">
@@ -83,7 +83,7 @@
</ion-content>
</ion-slide>
</ion-slide-box>
</ion-pane>
</ion-side-menu-content>
<ion-side-menu side="left">
<header class="bar bar-header bar-assertive">
<h1 class="title">Right</h1>

4
js/ext/angular/test/subControllers.html
View File

@@ -11,7 +11,7 @@
<body>
<ion-side-menus>
<ion-pane ion-side-menu-content>
<ion-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>
@@ -19,7 +19,7 @@
<div class="content has-header">
<h1>Slide me side to side!</h1>
</div>
</ion-pane>
</ion-side-menu-content>
<ion-side-menu side="left">
<h2>Left</h2>
<ul class="list">

7
js/ext/angular/test/viewState.html
View File

@@ -48,6 +48,10 @@
<button class="button button-block button-positive" ng-click="signIn(user)">
Sign-In
</button>
<form ng-submit="something()">
<input type="text">
<button type="submit"></button>
</form>
<p class="text-center">
<a href="#/sign-in">Sign-In</a> -
<a href="#/forgot-password">Forgot password</a> -
@@ -324,6 +328,9 @@
$scope.foo = function() {
alert('foo');
};
$scope.something = function() {
alert('something');
};
$scope.signIn = function(user) {
$state.go('tabs.autolist');

6
scripts/travis/release-new-version.sh
View File

@@ -32,8 +32,6 @@ function run {
cd $IONIC_DIR
git reset --hard $TRAVIS_COMMIT
CODENAME=$(readJsonProp "package.json" "codename")
replaceJsonProp "bower.json" "version" "$VERSION"
@@ -50,8 +48,8 @@ function run {
git commit -m "finalize-release: v$VERSION \"$CODENAME\""
git tag -f -m "v$VERSION" v$VERSION
git push -qf $RELEASE_REMOTE master
git push -qf $RELEASE_REMOTE v$VERSION
git push -q $RELEASE_REMOTE master
git push -q $RELEASE_REMOTE v$VERSION
echo "-- v$VERSION \"$CODENAME\" pushed to $RELEASE_REMOTE/master successfully!"
}