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

Fixed #143 - side menu zindex bug

Browse Source
This commit is contained in:
Max Lynch
2013-11-15 21:08:53 -06:00
parent 42dd53850b
commit cfa2aa6401
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24355,23 +24355,22 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side; $scope.side = $attr.side;
sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0;
};
sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0;
};
if($scope.side == 'left') { if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true; sideMenuCtrl.left.isEnabled = true;
sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0;
};
} else if($scope.side == 'right') { } else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true; sideMenuCtrl.right.isEnabled = true;
sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0;
};
} }
$element.append(transclude($scope)); $element.append(transclude($scope));

5
dist/js/ionic.js vendored
View File

@ -3604,6 +3604,11 @@ window.ionic = {
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
/**
* The side menu view handles one of the side menu's in a Side Menu Controller
* configuration.
* It takes a DOM reference to that side menu element.
*/
ionic.views.SideMenu = ionic.views.View.inherit({ ionic.views.SideMenu = ionic.views.View.inherit({
initialize: function(opts) { initialize: function(opts) {
this.el = opts.el; this.el = opts.el;

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

@ -126,23 +126,22 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side; $scope.side = $attr.side;
sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0;
};
sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0;
};
if($scope.side == 'left') { if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true; sideMenuCtrl.left.isEnabled = true;
sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0;
};
} else if($scope.side == 'right') { } else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true; sideMenuCtrl.right.isEnabled = true;
sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1;
};
sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0;
};
} }
$element.append(transclude($scope)); $element.append(transclude($scope));

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

@ -7,6 +7,8 @@
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet"> <link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../../../dist/css/ionic.css"> <link rel="stylesheet" href="../../../../dist/css/ionic.css">
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
</head> </head>
<body> <body>
@ -47,8 +49,6 @@
</menu> </menu>
</side-menu> </side-menu>
</div> </div>
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
<script> <script>
angular.module('sideMenuTest', ['ionic']) angular.module('sideMenuTest', ['ionic'])

5
js/views/sideMenuView.js
View File

@ -1,6 +1,11 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
/**
* The side menu view handles one of the side menu's in a Side Menu Controller
* configuration.
* It takes a DOM reference to that side menu element.
*/
ionic.views.SideMenu = ionic.views.View.inherit({ ionic.views.SideMenu = ionic.views.View.inherit({
initialize: function(opts) { initialize: function(opts) {
this.el = opts.el; this.el = opts.el;