Changeset 6e5aa8d4aa61dd10ac2708347b900d661285b0f8

Timestamp:

07/13/10 02:01:02 (8 weeks ago)

Author:

Jim Garrison <jim@…>

Children:

f2b6d3a95619e9d1e1cbebf64b264512711c3698

Parents:

3d2e25991c8b82f523e84aafebb7b408a044fbd1

git-committer:

Jim Garrison <jim@jimgarrison.org> / 2010-07-12T23:01:02Z-0700

Message:

upgraded to jqueryui 1.8.2

Location:

ductus

Files:

• static/common/js/jquery-ui-1.8.2.custom.buildopts.txt (moved) (moved from ductus/static/common/js/jquery-ui-1.8.custom.buildopts.txt)
• static/common/js/jquery-ui-1.8.2.custom.js (moved) (moved from ductus/static/common/js/jquery-ui-1.8.custom.js) (36 diffs)
• static/common/js/jquery-ui-1.8.2.custom.min.js (added)
• static/common/js/jquery-ui-1.8.custom.min.js (deleted)
• static/common/js/jquery-ui-authors.txt (modified) (1 diff)
• templates/ductus_base.html (modified) (1 diff)

ductus/static/common/js/jquery-ui-1.8.2.custom.js

@@ -1 +1 @@
 /*!
- * jQuery UI 1.8
+ * jQuery UI 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -8 +8 @@
  * http://docs.jquery.com/UI
  */
-;jQuery.ui || (function($) {
+
+(function($) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ($.ui.version) {
+        return;
+}
 
 //Helper functions and ui object
-$.ui = {
-        version: "1.8",
+$.extend($.ui, {
+        version: "1.8.2",
 
         // $.ui.plugin is deprecated.  Use the proxy pattern instead.
@@ -71 +80 @@
 
         keyCode: {
+                ALT: 18,
                 BACKSPACE: 8,
                 CAPS_LOCK: 20,
                 COMMA: 188,
+                COMMAND: 91,
+                COMMAND_LEFT: 91, // COMMAND
+                COMMAND_RIGHT: 93,
                 CONTROL: 17,
                 DELETE: 46,
@@ -83 +96 @@
                 INSERT: 45,
                 LEFT: 37,
+                MENU: 93, // COMMAND_RIGHT
                 NUMPAD_ADD: 107,
                 NUMPAD_DECIMAL: 110,
@@ -96 +110 @@
                 SPACE: 32,
                 TAB: 9,
-                UP: 38
+                UP: 38,
+                WINDOWS: 91 // COMMAND
         }
-};
+});
 
 //jQuery plugins
@@ -118 +133 @@
                 return this
                         .attr('unselectable', 'off')
-                        .css('MozUserSelect', '')
-                        .unbind('selectstart.ui');
+                        .css('MozUserSelect', '');
         },
 
@@ -125 +139 @@
                 return this
                         .attr('unselectable', 'on')
-                        .css('MozUserSelect', 'none')
-                        .bind('selectstart.ui', function() { return false; });
+                        .css('MozUserSelect', 'none');
         },
 
@@ -203 +216 @@
 })(jQuery);
 /*!
- * jQuery UI Widget 1.8
+ * jQuery UI Widget 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -359 +372 @@
                         .removeClass(
                                 this.widgetBaseClass + "-disabled " +
-                                this.namespace + "-state-disabled" );
+                                "ui-state-disabled" );
         },
 
@@ -396 +409 @@
                                 [ value ? "addClass" : "removeClass"](
                                         this.widgetBaseClass + "-disabled" + " " +
-                                        this.namespace + "-state-disabled" )
+                                        "ui-state-disabled" )
                                 .attr( "aria-disabled", value );
                 }
@@ -439 +452 @@
 })( jQuery );
 /*!
- * jQuery UI Mouse 1.8
+ * jQuery UI Mouse 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -590 +603 @@
 })(jQuery);
 /*
- * jQuery UI Position 1.8
+ * jQuery UI Position 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -704 +717 @@
                 }
 
+                // prevent fractions (see #5280)
+                position.left = parseInt( position.left );
+                position.top = parseInt( position.top );
+
                 $.each( [ "left", "top" ], function( i, dir ) {
                         if ( $.ui.position[ collision[i] ] ) {
@@ -819 +836 @@
 }( jQuery ));
 /*
- * jQuery UI Draggable 1.8
+ * jQuery UI Draggable 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -1279 +1296 @@
 
 $.extend($.ui.draggable, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
@@ -1616 +1633 @@
 })(jQuery);
 /*
- * jQuery UI Droppable 1.8
+ * jQuery UI Droppable 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -1764 +1781 @@
 
 $.extend($.ui.droppable, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
@@ -1901 +1918 @@
 })(jQuery);
 /*
- * jQuery UI Resizable 1.8
+ * jQuery UI Resizable 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -2421 +2438 @@
 
 $.extend($.ui.resizable, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
@@ -2699 +2716 @@
 
 })(jQuery);
+
 /*
- * jQuery UI Selectable 1.8
+ * jQuery UI Selectable 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -2757 +2775 @@
                 this._mouseInit();
 
-                this.helper = $(document.createElement('div'))
-                        .css({border:'1px dotted black'})
-                        .addClass("ui-selectable-helper");
+                this.helper = $("<div class='ui-selectable-helper'></div>");
         },
 
@@ -2822 +2838 @@
                         var selectee = $.data(this, "selectable-item");
                         if (selectee) {
-                                selectee.$element.removeClass("ui-unselecting").addClass('ui-selecting');
-                                selectee.unselecting = false;
-                                selectee.selecting = true;
-                                selectee.selected = true;
-                                // selectable SELECTING callback
-                                self._trigger("selecting", event, {
-                                        selecting: selectee.element
-                                });
+                                var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected');
+                                selectee.$element
+                                        .removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+                                        .addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+                                selectee.unselecting = !doSelect;
+                                selectee.selecting = doSelect;
+                                selectee.selected = doSelect;
+                                // selectable (UN)SELECTING callback
+                                if (doSelect) {
+                                        self._trigger("selecting", event, {
+                                                selecting: selectee.element
+                                        });
+                                } else {
+                                        self._trigger("unselecting", event, {
+                                                unselecting: selectee.element
+                                        });
+                                }
                                 return false;
                         }
@@ -2956 +2981 @@
 
 $.extend($.ui.selectable, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
 })(jQuery);
 /*
- * jQuery UI Sortable 1.8
+ * jQuery UI Sortable 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -3035 +3060 @@
         },
 
+        _setOption: function(key, value){
+                if ( key === "disabled" ) {
+                        this.options[ key ] = value;
+        
+                        this.widget()
+                                [ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
+                } else {
+                        // Don't call widget base _setOption for disable as it adds ui-state-disabled class
+                        $.Widget.prototype._setOption.apply(this, arguments);
+                }
+        },
+
         _mouseCapture: function(event, overrideHandle) {
 
@@ -4011 +4048 @@
 
 $.extend($.ui.sortable, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
 })(jQuery);
 /*
- * jQuery UI Dialog 1.8
+ * jQuery UI Dialog 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -4639 +4676 @@
                 // reset content sizing
                 // hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350)
-                this.element.css('width', 'auto')
-                        .hide();
+                this.element.css({
+                        width: 'auto',
+                        minHeight: 0,
+                        height: 0
+                });
 
                 // reset wrapper sizing
@@ -4667 +4707 @@
 
 $.extend($.ui.dialog, {
-        version: "1.8",
+        version: "1.8.2",
 
         uuid: 0,
@@ -4836 +4876 @@
 }(jQuery));
 /*
- * jQuery UI Tabs 1.8
+ * jQuery UI Tabs 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -4852 +4892 @@
 var tabId = 0,
         listId = 0;
+
+function getNextTabId() {
+        return ++tabId;
+}
+
+function getNextListId() {
+        return ++listId;
+}
 
 $.widget("ui.tabs", {
@@ -4893 +4941 @@
         _tabId: function(a) {
                 return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '') ||
-                        this.options.idPrefix + (++tabId);
+                        this.options.idPrefix + getNextTabId();
         },
 
@@ -4901 +4949 @@
 
         _cookie: function() {
-                var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + (++listId));
+                var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + getNextListId());
                 return $.cookie.apply(null, [cookie].concat($.makeArray(arguments)));
         },
@@ -5497 +5545 @@
 
 $.extend($.ui.tabs, {
-        version: '1.8'
+        version: '1.8.2'
 });
 
@@ -5557 +5605 @@
 })(jQuery);
 /*
- * jQuery UI Progressbar 1.8
+ * jQuery UI Progressbar 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -5659 +5707 @@
 
 $.extend( $.ui.progressbar, {
-        version: "1.8"
+        version: "1.8.2"
 });
 
 })( jQuery );
 /*
- * jQuery UI Effects 1.8
+ * jQuery UI Effects 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -5966 +6014 @@
 
 $.extend($.effects, {
-        version: "1.8",
+        version: "1.8.2",
 
         // Saves a set of properties in a data storage
@@ -6378 +6426 @@
 })(jQuery);
 /*
- * jQuery UI Effects Transfer 1.8
+ * jQuery UI Effects Transfer 1.8.2
  *
  * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)

ductus/static/common/js/jquery-ui-authors.txt

@@ -1 @@
-jQuery UI Authors (http://ui.jquery.com/about)
+jQuery UI Authors (http://jqueryui.com/about)
 
 This software consists of voluntary contributions made by many
 individuals. For exact contribution history, see the revision history
-and logs, available at http://jquery-ui.googlecode.com/svn/
+and logs, available at http://github.com/jquery/jquery-ui
 
 Brandon Aaron

ductus/templates/ductus_base.html

@@ -7 +7 @@
     {# include local (site-specific) css #}
     <script type="text/javascript" src="{{ ductus_media_prefix }}common/js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="{{ ductus_media_prefix }}common/js/jquery-ui-1.8.custom.min.js"></script>
+    <script type="text/javascript" src="{{ ductus_media_prefix }}common/js/jquery-ui-1.8.2.custom.min.js"></script>
     <script type="text/javascript" src="{{ ductus_media_prefix }}common/js/jquery.metadata.min.js"></script>
     <script type="text/javascript" src="{{ ductus_media_prefix }}common/js/json2.min.js"></script>