From ea3b0e93981e63a644f90dd8862b1d271a148916 Mon Sep 17 00:00:00 2001 From: Frankie Bagnardi Date: Mon, 11 Nov 2013 06:02:53 -0800 Subject: [PATCH 1/3] #343 modal text can't be selected --- src/modules/modal.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/modal.less b/src/modules/modal.less index 93efc6146..689a4d2d6 100755 --- a/src/modules/modal.less +++ b/src/modules/modal.less @@ -31,6 +31,11 @@ -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; + + -webkit-user-select: initial; + -moz-user-select: initial; + -ms-user-select: initial; + user-select: initial; } @@ -285,4 +290,4 @@ width: 44%; margin-left: -22%; } -} \ No newline at end of file +} From a7a2380084f0612502112599d0236b472b2665ed Mon Sep 17 00:00:00 2001 From: Frankie Bagnardi Date: Mon, 11 Nov 2013 06:09:40 -0800 Subject: [PATCH 2/3] replaced "initial" with "text" I believe this is what we want. [mdn](https://developer.mozilla.org/en-US/docs/Web/CSS/user-select) doesn't specify which is the default. Chrome works with `initial`, but firefox doesn't. --- src/modules/modal.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/modal.less b/src/modules/modal.less index 689a4d2d6..326874743 100755 --- a/src/modules/modal.less +++ b/src/modules/modal.less @@ -32,10 +32,10 @@ -moz-border-radius: 5px; border-radius: 5px; - -webkit-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; } From dff16cea617dea7c50b5b10a59974a8733a325ab Mon Sep 17 00:00:00 2001 From: Chris Hutchinson Date: Mon, 11 Nov 2013 15:40:27 -0500 Subject: [PATCH 3/3] Clean out trailing commas Breaks IE8 below and Google closure compiler --- src/modules/accordion.js | 2 +- src/modules/dimmer.js | 2 +- src/modules/modal.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/accordion.js b/src/modules/accordion.js index 0aa28d2d8..1184ecc3a 100755 --- a/src/modules/accordion.js +++ b/src/modules/accordion.js @@ -406,7 +406,7 @@ $.fn.accordion.settings = { selector : { title : '.title', content : '.content' - }, + } }; diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js index 01de2fbbe..b3d5f814d 100755 --- a/src/modules/dimmer.js +++ b/src/modules/dimmer.js @@ -164,7 +164,7 @@ $.fn.dimmer = function(parameters) { complete : function() { module.set.active(); callback(); - }, + } }) ; } diff --git a/src/modules/modal.js b/src/modules/modal.js index 62f339c89..5c6977402 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -676,7 +676,7 @@ $.fn.modal.settings = { className : { active : 'active', scrolling : 'scrolling' - }, + } };