From c20cef6ae83b13af93fb8c999c0be8d51a5c50fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= Date: Sat, 1 Oct 2011 10:11:55 -0400 Subject: [PATCH] Core: Removed .disableSelection() --- demos/draggable/delay-start.html | 1 - demos/draggable/handle.html | 1 - demos/draggable/sortable.html | 1 - demos/sortable/connect-lists-through-tabs.html | 2 +- demos/sortable/connect-lists.html | 2 +- demos/sortable/default.html | 1 - demos/sortable/delay-start.html | 2 -- demos/sortable/display-grid.html | 1 - demos/sortable/empty-lists.html | 2 -- demos/sortable/items.html | 2 -- demos/sortable/placeholder.html | 1 - demos/sortable/portlets.html | 3 +-- demos/widget/default.html | 4 +--- ui/jquery.ui.core.js | 11 ----------- ui/jquery.ui.dialog.js | 2 +- ui/jquery.ui.resizable.js | 7 ++----- 16 files changed, 7 insertions(+), 36 deletions(-) diff --git a/demos/draggable/delay-start.html b/demos/draggable/delay-start.html index 0c5533d0ea3..15e6d6177d6 100644 --- a/demos/draggable/delay-start.html +++ b/demos/draggable/delay-start.html @@ -17,7 +17,6 @@ $(function() { $( "#draggable" ).draggable({ distance: 20 }); $( "#draggable2" ).draggable({ delay: 1000 }); - $( ".ui-draggable" ).disableSelection(); }); diff --git a/demos/draggable/handle.html b/demos/draggable/handle.html index 29d9b9635bf..ca3e7b68064 100644 --- a/demos/draggable/handle.html +++ b/demos/draggable/handle.html @@ -18,7 +18,6 @@ $(function() { $( "#draggable" ).draggable({ handle: "p" }); $( "#draggable2" ).draggable({ cancel: "p.ui-widget-header" }); - $( "div, p" ).disableSelection(); }); diff --git a/demos/draggable/sortable.html b/demos/draggable/sortable.html index f4a13482130..8909c796962 100644 --- a/demos/draggable/sortable.html +++ b/demos/draggable/sortable.html @@ -25,7 +25,6 @@ helper: "clone", revert: "invalid" }); - $( "ul, li" ).disableSelection(); }); diff --git a/demos/sortable/connect-lists-through-tabs.html b/demos/sortable/connect-lists-through-tabs.html index 4489ab04f46..02125e5b6eb 100644 --- a/demos/sortable/connect-lists-through-tabs.html +++ b/demos/sortable/connect-lists-through-tabs.html @@ -17,7 +17,7 @@ diff --git a/demos/sortable/default.html b/demos/sortable/default.html index 6b09aeb77ec..9d04d8d9b8a 100644 --- a/demos/sortable/default.html +++ b/demos/sortable/default.html @@ -18,7 +18,6 @@ diff --git a/demos/sortable/delay-start.html b/demos/sortable/delay-start.html index ac4acb51538..7dff93fd571 100644 --- a/demos/sortable/delay-start.html +++ b/demos/sortable/delay-start.html @@ -23,8 +23,6 @@ $( "#sortable2" ).sortable({ distance: 15 }); - - $( "li" ).disableSelection(); }); diff --git a/demos/sortable/display-grid.html b/demos/sortable/display-grid.html index 3eecb6f0f7e..98d6ae6f402 100644 --- a/demos/sortable/display-grid.html +++ b/demos/sortable/display-grid.html @@ -17,7 +17,6 @@ diff --git a/demos/sortable/empty-lists.html b/demos/sortable/empty-lists.html index b202716ff81..a96ea44a2c2 100644 --- a/demos/sortable/empty-lists.html +++ b/demos/sortable/empty-lists.html @@ -24,8 +24,6 @@ connectWith: "ul", dropOnEmpty: false }); - - $( "#sortable1, #sortable2, #sortable3" ).disableSelection(); }); diff --git a/demos/sortable/items.html b/demos/sortable/items.html index 596b0cd2de0..710ac1ad742 100644 --- a/demos/sortable/items.html +++ b/demos/sortable/items.html @@ -23,8 +23,6 @@ $( "#sortable2" ).sortable({ cancel: ".ui-state-disabled" }); - - $( "#sortable1 li, #sortable2 li" ).disableSelection(); }); diff --git a/demos/sortable/placeholder.html b/demos/sortable/placeholder.html index 88fcd521aaa..0b7e3b13858 100644 --- a/demos/sortable/placeholder.html +++ b/demos/sortable/placeholder.html @@ -21,7 +21,6 @@ $( "#sortable" ).sortable({ placeholder: "ui-state-highlight" }); - $( "#sortable" ).disableSelection(); }); diff --git a/demos/sortable/portlets.html b/demos/sortable/portlets.html index bdb2c3a5a20..2ca2e5a736f 100644 --- a/demos/sortable/portlets.html +++ b/demos/sortable/portlets.html @@ -22,6 +22,7 @@ diff --git a/demos/widget/default.html b/demos/widget/default.html index a645ef28340..53f94c74d88 100644 --- a/demos/widget/default.html +++ b/demos/widget/default.html @@ -44,9 +44,7 @@ _create: function() { this.element // add a class for theming - .addClass( "custom-colorize" ) - // prevent double click to select text - .disableSelection(); + .addClass( "custom-colorize" ); this.changer = $( "", { text: "change", diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index 8bcc4c441cb..a961cd16130 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -115,17 +115,6 @@ $.fn.extend({ } return 0; - }, - - disableSelection: function() { - return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) + - ".ui-disableSelection", function( event ) { - event.preventDefault(); - }); - }, - - enableSelection: function() { - return this.unbind( ".ui-disableSelection" ); } }); diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 065d640fb31..314fc0202ee 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -142,7 +142,7 @@ $.widget("ui.dialog", { .html( title ) .prependTo( uiDialogTitlebar ); - uiDialogTitlebar.find( "*" ).add( uiDialogTitlebar ).disableSelection(); + uiDialogTitlebar.find( "*" ).add( uiDialogTitlebar ); this._hoverable( uiDialogTitlebarClose ); this._focusable( uiDialogTitlebarClose ); diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js index 673a8fd753b..4a101e00898 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -158,8 +158,7 @@ $.widget("ui.resizable", $.ui.mouse, { //TODO: make renderAxis a prototype function this._renderAxis(this.element); - this._handles = $('.ui-resizable-handle', this.element) - .disableSelection(); + this._handles = $('.ui-resizable-handle', this.element); //Matching axis name this._handles.mouseover(function() { @@ -489,9 +488,7 @@ $.widget("ui.resizable", $.ui.mouse, { zIndex: ++o.zIndex //TODO: Don't modify option }); - this.helper - .appendTo("body") - .disableSelection(); + this.helper.appendTo("body"); } else { this.helper = this.element;