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 side menu scoping bug

Browse Source
This commit is contained in:
Max Lynch
2013-11-09 13:23:19 -06:00
parent 95c9a7c10f
commit 639e39f5fd
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/ionic.css vendored
View File

@ -2091,7 +2091,7 @@ sub {
fieldset { fieldset {
margin: 0 2px; margin: 0 2px;
padding: 0.35em 0.625em 0.75em; padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0; } border: 1px solid silver; }
/** /**
* 1. Correct `color` not being inherited in IE 8/9. * 1. Correct `color` not being inherited in IE 8/9.
@ -3974,7 +3974,7 @@ input[type="file"] {
line-height: 34px; } line-height: 34px; }
select { select {
border: 1px solid #ccc; border: 1px solid #cccccc;
background-color: white; } background-color: white; }
select[multiple], select[multiple],
@ -4033,7 +4033,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%; border-radius: 50%;
background: white; background: white;
content: ' '; content: ' ';
transition: background-color .1s ease-in-out; } transition: background-color 0.1s ease-in-out; }
/* the checkmark within the box */ /* the checkmark within the box */
.checkbox input:after { .checkbox input:after {
@ -4048,7 +4048,7 @@ input[type="checkbox"][readonly] {
border-right: 0; border-right: 0;
content: ' '; content: ' ';
opacity: 0; opacity: 0;
transition: opacity .05s ease-in-out; transition: opacity 0.05s ease-in-out;
-webkit-transform: rotate(-45deg); -webkit-transform: rotate(-45deg);
transform: rotate(-45deg); } transform: rotate(-45deg); }
@ -4477,7 +4477,7 @@ input[type="range"] {
.button-icon:active, .button-icon.active { .button-icon:active, .button-icon.active {
background: none; background: none;
box-shadow: none; box-shadow: none;
text-shadow: 0px 0px 10px #fff; } text-shadow: 0px 0px 10px white; }
.padding > .button.block:first-child { .padding > .button.block:first-child {
margin-top: 0; } margin-top: 0; }

5
dist/css/themes/ionic-ios7.css vendored
View File

@ -1,3 +1,4 @@
@charset "UTF-8";
/** /**
* Mixins * Mixins
* -------------------------------------------------- * --------------------------------------------------
@ -123,7 +124,7 @@
right: 20px; right: 20px;
transition: 0.2s ease; transition: 0.2s ease;
transition-property: left, right; transition-property: left, right;
transition-delay: 0s, .05s; } transition-delay: 0s, 0.05s; }
.toggle :checked + .track { .toggle :checked + .track {
/* When the toggle is "on" */ /* When the toggle is "on" */
@ -138,4 +139,4 @@
right: 0; right: 0;
left: 20px; left: 20px;
-webkit-transform: none; -webkit-transform: none;
transition-delay: .05s, 0s; } transition-delay: 0.05s, 0s; }

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

@ -1070,12 +1070,11 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
require: '^sideMenu', require: '^sideMenu',
replace: true, replace: true,
transclude: true, transclude: true,
scope: { scope: true,
side: '@'
},
template: '<div class="menu menu-{{side}}"></div>', template: '<div class="menu menu-{{side}}"></div>',
compile: function(element, attr, transclude) { compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side;
if($scope.side == 'left') { if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true; sideMenuCtrl.left.isEnabled = true;

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

@ -119,12 +119,11 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
require: '^sideMenu', require: '^sideMenu',
replace: true, replace: true,
transclude: true, transclude: true,
scope: { scope: true,
side: '@'
},
template: '<div class="menu menu-{{side}}"></div>', template: '<div class="menu menu-{{side}}"></div>',
compile: function(element, attr, transclude) { compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side;
if($scope.side == 'left') { if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true; sideMenuCtrl.left.isEnabled = true;