From 1cda55efd7e8d2e17a0cfb80730874ab88de5c19 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Mon, 11 Nov 2013 09:08:15 -0600 Subject: [PATCH] Everything is an option --- dist/css/ionic.css | 2 +- dist/js/ionic.js | 11 +++++++---- js/views/modalView.js | 11 +++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index b8899b1e52..b8d816ee7b 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -49,7 +49,7 @@ .white { color: white; } -/*! +/* Ionicons, v1.3.3 Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ https://twitter.com/helloimben https://twitter.com/ionicframework diff --git a/dist/js/ionic.js b/dist/js/ionic.js index dbd9894197..b12d4a9664 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -3319,7 +3319,8 @@ window.ionic = { ionic.views.Modal = ionic.views.View.inherit({ initialize: function(opts) { opts = ionic.extend({ - focusFirstInput: true + focusFirstInput: true, + unfocusOnHide: true }, opts); ionic.extend(this, opts); @@ -3338,9 +3339,11 @@ window.ionic = { this.el.classList.remove('active'); // Unfocus all elements - var inputs = this.el.querySelectorAll('input, textarea'); - for(var i = 0; i < inputs.length; i++) { - inputs[i].blur && inputs[i].blur(); + if(this.unfocusOnHide) { + var inputs = this.el.querySelectorAll('input, textarea'); + for(var i = 0; i < inputs.length; i++) { + inputs[i].blur && inputs[i].blur(); + } } } }); diff --git a/js/views/modalView.js b/js/views/modalView.js index a8b8e7cebe..0af68b65b5 100644 --- a/js/views/modalView.js +++ b/js/views/modalView.js @@ -4,7 +4,8 @@ ionic.views.Modal = ionic.views.View.inherit({ initialize: function(opts) { opts = ionic.extend({ - focusFirstInput: true + focusFirstInput: true, + unfocusOnHide: true }, opts); ionic.extend(this, opts); @@ -23,9 +24,11 @@ this.el.classList.remove('active'); // Unfocus all elements - var inputs = this.el.querySelectorAll('input, textarea'); - for(var i = 0; i < inputs.length; i++) { - inputs[i].blur && inputs[i].blur(); + if(this.unfocusOnHide) { + var inputs = this.el.querySelectorAll('input, textarea'); + for(var i = 0; i < inputs.length; i++) { + inputs[i].blur && inputs[i].blur(); + } } } });