Skip to content

Commit

Permalink
SE-366 #comment Bugfix: color picker input broken inside jQuery UI mo…
Browse files Browse the repository at this point in the history
…dal Dialog
  • Loading branch information
brenopolanski committed Sep 6, 2015
1 parent 8ecb3f4 commit fb7d664
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions js/saiku/views/Modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//goog.provide('saiku.views.Modal');

/*
* Copyright 2012 OSBI Ltd
*
Expand All @@ -16,7 +14,6 @@
* limitations under the License.
*/


/**
* The base class for all modal dialogs
*/
Expand Down Expand Up @@ -96,3 +93,13 @@ var Modal = Backbone.View.extend({
return false;
}
});

/* jQuery UI - v1.10.2 - 2013-12-12 (and later)
* http://bugs.jqueryui.com/ticket/9087#comment:30
* http://bugs.jqueryui.com/ticket/9087#comment:27 - bugfix
* http://bugs.jqueryui.com/ticket/4727#comment:23 - bugfix
* allowInteraction fix
*/
$.ui.dialog.prototype._allowInteraction = function(event) {
return !!$(event.target).closest('.ui-dialog, .ui-datepicker, .sp-input').length;
};

0 comments on commit fb7d664

Please sign in to comment.