diff options
Diffstat (limited to 'template-common/lib/ui/ui.core.js')
-rw-r--r-- | template-common/lib/ui/ui.core.js | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/template-common/lib/ui/ui.core.js b/template-common/lib/ui/ui.core.js index 5cb669800..3d2e63873 100644 --- a/template-common/lib/ui/ui.core.js +++ b/template-common/lib/ui/ui.core.js @@ -1,5 +1,5 @@ /* - * jQuery UI 1.6b + * jQuery UI 1.5.2 * * Copyright (c) 2008 Paul Bakaus (ui.jquery.com) * Dual licensed under the MIT (MIT-LICENSE.txt) @@ -9,11 +9,6 @@ */ ;(function($) { -// This adds a selector to check if data exists. -jQuery.extend(jQuery.expr[':'], { - data: "jQuery.data(a, m[3])" -}); - $.ui = { plugin: { add: function(module, option, set) { @@ -52,23 +47,15 @@ $.ui = { return $.ui.cssCache[name]; }, disableSelection: function(el) { - $(el).attr('unselectable', 'on').css('MozUserSelect', 'none').bind('selectstart', function() { return false; }); + $(el).attr('unselectable', 'on').css('MozUserSelect', 'none'); }, enableSelection: function(el) { - $(el).attr('unselectable', 'off').css('MozUserSelect', '').unbind('selectstart'); + $(el).attr('unselectable', 'off').css('MozUserSelect', ''); }, hasScroll: function(e, a) { - var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop', - has = false; - - if (e[scroll] > 0) { return true; } - - // TODO: determine which cases actually cause this to happen - // if the element doesn't have the scroll set, see if it's possible to - // set the scroll - e[scroll] = 1; - has = (e[scroll] > 0); - e[scroll] = 0; + var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false; + if (e[scroll] > 0) return true; e[scroll] = 1; + has = e[scroll] > 0 ? true : false; e[scroll] = 0; return has; } }; @@ -121,7 +108,6 @@ $.widget = function(name, prototype) { var self = this; this.widgetName = name; - this.widgetEventPrefix = $[namespace][name].eventPrefix || name; this.widgetBaseClass = namespace + '-' + name; this.options = $.extend({}, $.widget.defaults, $[namespace][name].defaults, options); @@ -165,13 +151,6 @@ $.widget.prototype = { }, disable: function() { this.setData('disabled', true); - }, - - trigger: function(type, e, data) { - var eventName = (type == this.widgetEventPrefix - ? type : this.widgetEventPrefix + type); - e = e || $.event.fix({ type: eventName, target: this.element[0] }); - return this.element.triggerHandler(eventName, [e, data], this.options[type]); } }; |