From 14292a4186c2d9cc1070a94a4c32fbd5d6d5ecfa Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 8 Dec 2014 14:06:17 -0600 Subject: [PATCH 1/3] refactor(tabs-striped): remove bottom box-shadow --- scss/_tabs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_tabs.scss b/scss/_tabs.scss index 559b4bc9bc..939f178d88 100644 --- a/scss/_tabs.scss +++ b/scss/_tabs.scss @@ -164,7 +164,7 @@ background-color: white; background-image: none; border: none; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); + border-bottom: 1px solid #ddd; padding-top: $tabs-striped-border-width; } .tab-item { From 5c1d0fa2b7080a618ef4c12f636d1117a8ac19ee Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 8 Dec 2014 15:52:36 -0600 Subject: [PATCH 2/3] fix(bar): do not disable pointer-events in nav-bar --- scss/_bar.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/scss/_bar.scss b/scss/_bar.scss index 29953f5d7c..34596add1d 100644 --- a/scss/_bar.scss +++ b/scss/_bar.scss @@ -39,7 +39,6 @@ background-size: 100% 1px; background-repeat: no-repeat; } - pointer-events: auto; &.bar-clear { border: none; @@ -364,7 +363,6 @@ top: 0; right: 0; left: 0; - pointer-events: none; z-index: $z-index-bar; } From dd71524ed30fe629e9d280d0b7c6ee27af53613f Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 8 Dec 2014 16:56:01 -0600 Subject: [PATCH 3/3] fix(popup): release backdrop when multiple popups --- js/angular/service/popup.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/js/angular/service/popup.js b/js/angular/service/popup.js index 1e10265d7f..80f04cbb22 100644 --- a/js/angular/service/popup.js +++ b/js/angular/service/popup.js @@ -272,7 +272,7 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB options = extend({ scope: null, title: '', - buttons: [], + buttons: [] }, options || {}); var popupPromise = $ionicTemplateLoader.compile({ @@ -398,13 +398,13 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB previousPopup.show(); } else { //Remove popup-open & backdrop if this is last popup - $timeout(function(){ + $timeout(function() { // wait to remove this due to a 300ms delay native // click which would trigging whatever was underneath this $ionicBody.removeClass('popup-open'); }, 400); - $timeout(function(){ - if(popupStack.length === 0)$ionicBackdrop.release(); + $timeout(function() { + $ionicBackdrop.release(); }, config.stackPushDelay || 0); ($ionicPopup._backButtonActionDone || angular.noop)(); } @@ -432,7 +432,7 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB } function showAlert(opts) { - return showPopup( extend({ + return showPopup(extend({ buttons: [{ text: opts.okText || 'OK', type: opts.okType || 'button-positive', @@ -440,13 +440,13 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB return true; } }] - }, opts || {}) ); + }, opts || {})); } function showConfirm(opts) { - return showPopup( extend({ + return showPopup(extend({ buttons: [{ - text: opts.cancelText || 'Cancel' , + text: opts.cancelText || 'Cancel', type: opts.cancelType || 'button-default', onTap: function(e) { return false; } }, { @@ -454,24 +454,24 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB type: opts.okType || 'button-positive', onTap: function(e) { return true; } }] - }, opts || {}) ); + }, opts || {})); } function showPrompt(opts) { var scope = $rootScope.$new(true); scope.data = {}; var text = ''; - if(opts.template && /<[a-z][\s\S]*>/i.test(opts.template) === false){ - text = ''+opts.template+''; + if (opts.template && /<[a-z][\s\S]*>/i.test(opts.template) === false) { + text = '' + opts.template + ''; delete opts.template; } - return showPopup( extend({ - template: text+'', scope: scope, buttons: [{ text: opts.cancelText || 'Cancel', - type: opts.cancelType|| 'button-default', + type: opts.cancelType || 'button-default', onTap: function(e) {} }, { text: opts.okText || 'OK', @@ -480,7 +480,6 @@ function($ionicTemplateLoader, $ionicBackdrop, $q, $timeout, $rootScope, $ionicB return scope.data.response || ''; } }] - }, opts || {}) ); + }, opts || {})); } }]); -