Index: trunk/phase3/resources/Resources.php |
— | — | @@ -341,9 +341,12 @@ |
342 | 342 | 'is' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-is.js', |
343 | 343 | 'it' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-it.js', |
344 | 344 | 'ja' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ja.js', |
| 345 | + 'kk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js', |
345 | 346 | 'ko' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ko.js', |
| 347 | + 'lb' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js', |
346 | 348 | 'lt' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lt.js', |
347 | 349 | 'lv' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lv.js', |
| 350 | + 'mk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-mk.js', |
348 | 351 | 'ml' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ml.js', |
349 | 352 | 'ms' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ms.js', |
350 | 353 | 'nl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-nl.js', |
Index: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js |
— | — | @@ -0,0 +1,23 @@ |
| 2 | +/* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */ |
| 3 | +/* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */ |
| 4 | +jQuery(function($){ |
| 5 | + $.datepicker.regional['kk'] = { |
| 6 | + closeText: 'Жабу', |
| 7 | + prevText: '<Алдыңғы', |
| 8 | + nextText: 'Келесі>', |
| 9 | + currentText: 'Бүгін', |
| 10 | + monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым', |
| 11 | + 'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'], |
| 12 | + monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау', |
| 13 | + 'Шіл','Там','Қыр','Қаз','Қар','Жел'], |
| 14 | + dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'], |
| 15 | + dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'], |
| 16 | + dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'], |
| 17 | + weekHeader: 'Не', |
| 18 | + dateFormat: 'dd.mm.yy', |
| 19 | + firstDay: 1, |
| 20 | + isRTL: false, |
| 21 | + showMonthAfterYear: false, |
| 22 | + yearSuffix: ''}; |
| 23 | + $.datepicker.setDefaults($.datepicker.regional['kk']); |
| 24 | +}); |
Property changes on: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js |
___________________________________________________________________ |
Added: svn:eol-style |
1 | 25 | + native |
Index: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-mk.js |
— | — | @@ -0,0 +1,23 @@ |
| 2 | +/* Macedonian i18n for the jQuery UI date picker plugin. */ |
| 3 | +/* Written by Stojce Slavkovski. */ |
| 4 | +jQuery(function($){ |
| 5 | + $.datepicker.regional['mk'] = { |
| 6 | + closeText: 'Затвори', |
| 7 | + prevText: '<', |
| 8 | + nextText: '>', |
| 9 | + currentText: 'Денес', |
| 10 | + monthNames: ['Јануари','Фебруари','Март','Април','Мај','Јуни', |
| 11 | + 'Јули','Август','Септември','Октомври','Ноември','Декември'], |
| 12 | + monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун', |
| 13 | + 'Јул','Авг','Сеп','Окт','Ное','Дек'], |
| 14 | + dayNames: ['Недела','Понеделник','Вторник','Среда','Четврток','Петок','Сабота'], |
| 15 | + dayNamesShort: ['Нед','Пон','Вто','Сре','Чет','Пет','Саб'], |
| 16 | + dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Са'], |
| 17 | + weekHeader: 'Сед', |
| 18 | + dateFormat: 'dd/mm/yy', |
| 19 | + firstDay: 1, |
| 20 | + isRTL: false, |
| 21 | + showMonthAfterYear: false, |
| 22 | + yearSuffix: ''}; |
| 23 | + $.datepicker.setDefaults($.datepicker.regional['mk']); |
| 24 | +}); |
Property changes on: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-mk.js |
___________________________________________________________________ |
Added: svn:eol-style |
1 | 25 | + native |
Index: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-hu.js |
— | — | @@ -2,19 +2,19 @@ |
3 | 3 | /* Written by Istvan Karaszi (jquery@spam.raszi.hu). */ |
4 | 4 | jQuery(function($){ |
5 | 5 | $.datepicker.regional['hu'] = { |
6 | | - closeText: 'bezárás', |
7 | | - prevText: '« vissza', |
8 | | - nextText: 'előre »', |
| 6 | + closeText: 'bezár', |
| 7 | + prevText: 'vissza', |
| 8 | + nextText: 'előre', |
9 | 9 | currentText: 'ma', |
10 | 10 | monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június', |
11 | 11 | 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'], |
12 | 12 | monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún', |
13 | 13 | 'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'], |
14 | | - dayNames: ['Vasárnap', 'Hétfö', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'], |
| 14 | + dayNames: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'], |
15 | 15 | dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'], |
16 | 16 | dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'], |
17 | | - weekHeader: 'Hé', |
18 | | - dateFormat: 'yy-mm-dd', |
| 17 | + weekHeader: 'Hét', |
| 18 | + dateFormat: 'yy.mm.dd.', |
19 | 19 | firstDay: 1, |
20 | 20 | isRTL: false, |
21 | 21 | showMonthAfterYear: true, |
Index: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-uk.js |
— | — | @@ -1,5 +1,6 @@ |
2 | 2 | /* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */ |
3 | 3 | /* Written by Maxim Drogobitskiy (maxdao@gmail.com). */ |
| 4 | +/* Corrected by Igor Milla (igor.fsp.milla@gmail.com). */ |
4 | 5 | jQuery(function($){ |
5 | 6 | $.datepicker.regional['uk'] = { |
6 | 7 | closeText: 'Закрити', |
— | — | @@ -13,7 +14,7 @@ |
14 | 15 | dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'], |
15 | 16 | dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'], |
16 | 17 | dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'], |
17 | | - weekHeader: 'Не', |
| 18 | + weekHeader: 'Тиж', |
18 | 19 | dateFormat: 'dd/mm/yy', |
19 | 20 | firstDay: 1, |
20 | 21 | isRTL: false, |
Index: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js |
— | — | @@ -0,0 +1,23 @@ |
| 2 | +/* Luxembourgish initialisation for the jQuery UI date picker plugin. */ |
| 3 | +/* Written by Michel Weimerskirch <michel@weimerskirch.net> */ |
| 4 | +jQuery(function($){ |
| 5 | + $.datepicker.regional['lb'] = { |
| 6 | + closeText: 'Fäerdeg', |
| 7 | + prevText: 'Zréck', |
| 8 | + nextText: 'Weider', |
| 9 | + currentText: 'Haut', |
| 10 | + monthNames: ['Januar','Februar','Mäerz','Abrëll','Mee','Juni', |
| 11 | + 'Juli','August','September','Oktober','November','Dezember'], |
| 12 | + monthNamesShort: ['Jan', 'Feb', 'Mäe', 'Abr', 'Mee', 'Jun', |
| 13 | + 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'], |
| 14 | + dayNames: ['Sonndeg', 'Méindeg', 'Dënschdeg', 'Mëttwoch', 'Donneschdeg', 'Freideg', 'Samschdeg'], |
| 15 | + dayNamesShort: ['Son', 'Méi', 'Dën', 'Mët', 'Don', 'Fre', 'Sam'], |
| 16 | + dayNamesMin: ['So','Mé','Dë','Më','Do','Fr','Sa'], |
| 17 | + weekHeader: 'W', |
| 18 | + dateFormat: 'dd.mm.yy', |
| 19 | + firstDay: 1, |
| 20 | + isRTL: false, |
| 21 | + showMonthAfterYear: false, |
| 22 | + yearSuffix: ''}; |
| 23 | + $.datepicker.setDefaults($.datepicker.regional['lb']); |
| 24 | +}); |
Property changes on: trunk/phase3/resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js |
___________________________________________________________________ |
Added: svn:eol-style |
1 | 25 | + native |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.button.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Button 1.8.16 |
| 3 | + * jQuery UI Button 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -319,7 +319,7 @@ |
320 | 320 | return; |
321 | 321 | } |
322 | 322 | var buttonElement = this.buttonElement.removeClass( typeClasses ), |
323 | | - buttonText = $( "<span></span>" ) |
| 323 | + buttonText = $( "<span></span>", this.element[0].ownerDocument ) |
324 | 324 | .addClass( "ui-button-text" ) |
325 | 325 | .html( this.options.label ) |
326 | 326 | .appendTo( buttonElement.empty() ) |
— | — | @@ -377,7 +377,7 @@ |
378 | 378 | }, |
379 | 379 | |
380 | 380 | refresh: function() { |
381 | | - var ltr = this.element.css( "direction" ) === "ltr"; |
| 381 | + var rtl = this.element.css( "direction" ) === "rtl"; |
382 | 382 | |
383 | 383 | this.buttons = this.element.find( this.options.items ) |
384 | 384 | .filter( ":ui-button" ) |
— | — | @@ -391,10 +391,10 @@ |
392 | 392 | }) |
393 | 393 | .removeClass( "ui-corner-all ui-corner-left ui-corner-right" ) |
394 | 394 | .filter( ":first" ) |
395 | | - .addClass( ltr ? "ui-corner-left" : "ui-corner-right" ) |
| 395 | + .addClass( rtl ? "ui-corner-right" : "ui-corner-left" ) |
396 | 396 | .end() |
397 | 397 | .filter( ":last" ) |
398 | | - .addClass( ltr ? "ui-corner-right" : "ui-corner-left" ) |
| 398 | + .addClass( rtl ? "ui-corner-left" : "ui-corner-right" ) |
399 | 399 | .end() |
400 | 400 | .end(); |
401 | 401 | }, |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.datepicker.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Datepicker 1.8.16 |
| 3 | + * jQuery UI Datepicker 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -12,7 +12,7 @@ |
13 | 13 | */ |
14 | 14 | (function( $, undefined ) { |
15 | 15 | |
16 | | -$.extend($.ui, { datepicker: { version: "1.8.16" } }); |
| 16 | +$.extend($.ui, { datepicker: { version: "1.8.17" } }); |
17 | 17 | |
18 | 18 | var PROP_NAME = 'datepicker'; |
19 | 19 | var dpuuid = new Date().getTime(); |
— | — | @@ -636,10 +636,10 @@ |
637 | 637 | return; |
638 | 638 | var inst = $.datepicker._getInst(input); |
639 | 639 | if ($.datepicker._curInst && $.datepicker._curInst != inst) { |
640 | | - if ( $.datepicker._datepickerShowing ) { |
641 | | - $.datepicker._triggerOnClose($.datepicker._curInst); |
| 640 | + $.datepicker._curInst.dpDiv.stop(true, true); |
| 641 | + if ( inst && $.datepicker._datepickerShowing ) { |
| 642 | + $.datepicker._hideDatepicker( $.datepicker._curInst.input[0] ); |
642 | 643 | } |
643 | | - $.datepicker._curInst.dpDiv.stop(true, true); |
644 | 644 | } |
645 | 645 | var beforeShow = $.datepicker._get(inst, 'beforeShow'); |
646 | 646 | var beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {}; |
— | — | @@ -788,14 +788,6 @@ |
789 | 789 | return [position.left, position.top]; |
790 | 790 | }, |
791 | 791 | |
792 | | - /* Trigger custom callback of onClose. */ |
793 | | - _triggerOnClose: function(inst) { |
794 | | - var onClose = this._get(inst, 'onClose'); |
795 | | - if (onClose) |
796 | | - onClose.apply((inst.input ? inst.input[0] : null), |
797 | | - [(inst.input ? inst.input.val() : ''), inst]); |
798 | | - }, |
799 | | - |
800 | 792 | /* Hide the date picker from view. |
801 | 793 | @param input element - the input field attached to the date picker */ |
802 | 794 | _hideDatepicker: function(input) { |
— | — | @@ -805,9 +797,10 @@ |
806 | 798 | if (this._datepickerShowing) { |
807 | 799 | var showAnim = this._get(inst, 'showAnim'); |
808 | 800 | var duration = this._get(inst, 'duration'); |
| 801 | + var self = this; |
809 | 802 | var postProcess = function() { |
810 | 803 | $.datepicker._tidyDialog(inst); |
811 | | - this._curInst = null; |
| 804 | + self._curInst = null; |
812 | 805 | }; |
813 | 806 | if ($.effects && $.effects[showAnim]) |
814 | 807 | inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess); |
— | — | @@ -816,8 +809,11 @@ |
817 | 810 | (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess); |
818 | 811 | if (!showAnim) |
819 | 812 | postProcess(); |
820 | | - $.datepicker._triggerOnClose(inst); |
821 | 813 | this._datepickerShowing = false; |
| 814 | + var onClose = this._get(inst, 'onClose'); |
| 815 | + if (onClose) |
| 816 | + onClose.apply((inst.input ? inst.input[0] : null), |
| 817 | + [(inst.input ? inst.input.val() : ''), inst]); |
822 | 818 | this._lastInput = null; |
823 | 819 | if (this._inDialog) { |
824 | 820 | this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' }); |
— | — | @@ -839,12 +835,16 @@ |
840 | 836 | _checkExternalClick: function(event) { |
841 | 837 | if (!$.datepicker._curInst) |
842 | 838 | return; |
843 | | - var $target = $(event.target); |
844 | | - if ($target[0].id != $.datepicker._mainDivId && |
| 839 | + |
| 840 | + var $target = $(event.target), |
| 841 | + inst = $.datepicker._getInst($target[0]); |
| 842 | + |
| 843 | + if ( ( ( $target[0].id != $.datepicker._mainDivId && |
845 | 844 | $target.parents('#' + $.datepicker._mainDivId).length == 0 && |
846 | 845 | !$target.hasClass($.datepicker.markerClassName) && |
847 | 846 | !$target.hasClass($.datepicker._triggerClass) && |
848 | | - $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI)) |
| 847 | + $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) || |
| 848 | + ( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst != inst ) ) |
849 | 849 | $.datepicker._hideDatepicker(); |
850 | 850 | }, |
851 | 851 | |
— | — | @@ -1814,7 +1814,7 @@ |
1815 | 1815 | $.datepicker = new Datepicker(); // singleton instance |
1816 | 1816 | $.datepicker.initialized = false; |
1817 | 1817 | $.datepicker.uuid = new Date().getTime(); |
1818 | | -$.datepicker.version = "1.8.16"; |
| 1818 | +$.datepicker.version = "1.8.17"; |
1819 | 1819 | |
1820 | 1820 | // Workaround for #4055 |
1821 | 1821 | // Add another global to avoid noConflict issues with inline event handlers |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.sortable.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Sortable 1.8.16 |
| 3 | + * jQuery UI Sortable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -62,13 +62,11 @@ |
63 | 63 | |
64 | 64 | destroy: function() { |
65 | 65 | this.element |
66 | | - .removeClass("ui-sortable ui-sortable-disabled") |
67 | | - .removeData("sortable") |
68 | | - .unbind(".sortable"); |
| 66 | + .removeClass("ui-sortable ui-sortable-disabled"); |
69 | 67 | this._mouseDestroy(); |
70 | 68 | |
71 | 69 | for ( var i = this.items.length - 1; i >= 0; i-- ) |
72 | | - this.items[i].item.removeData("sortable-item"); |
| 70 | + this.items[i].item.removeData(this.widgetName + "-item"); |
73 | 71 | |
74 | 72 | return this; |
75 | 73 | }, |
— | — | @@ -86,6 +84,7 @@ |
87 | 85 | }, |
88 | 86 | |
89 | 87 | _mouseCapture: function(event, overrideHandle) { |
| 88 | + var that = this; |
90 | 89 | |
91 | 90 | if (this.reverting) { |
92 | 91 | return false; |
— | — | @@ -98,12 +97,12 @@ |
99 | 98 | |
100 | 99 | //Find out if the clicked node (or one of its parents) is a actual item in this.items |
101 | 100 | var currentItem = null, self = this, nodes = $(event.target).parents().each(function() { |
102 | | - if($.data(this, 'sortable-item') == self) { |
| 101 | + if($.data(this, that.widgetName + '-item') == self) { |
103 | 102 | currentItem = $(this); |
104 | 103 | return false; |
105 | 104 | } |
106 | 105 | }); |
107 | | - if($.data(event.target, 'sortable-item') == self) currentItem = $(event.target); |
| 106 | + if($.data(event.target, that.widgetName + '-item') == self) currentItem = $(event.target); |
108 | 107 | |
109 | 108 | if(!currentItem) return false; |
110 | 109 | if(this.options.handle && !overrideHandle) { |
— | — | @@ -528,7 +527,7 @@ |
529 | 528 | for (var i = connectWith.length - 1; i >= 0; i--){ |
530 | 529 | var cur = $(connectWith[i]); |
531 | 530 | for (var j = cur.length - 1; j >= 0; j--){ |
532 | | - var inst = $.data(cur[j], 'sortable'); |
| 531 | + var inst = $.data(cur[j], this.widgetName); |
533 | 532 | if(inst && inst != this && !inst.options.disabled) { |
534 | 533 | queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]); |
535 | 534 | } |
— | — | @@ -550,7 +549,7 @@ |
551 | 550 | |
552 | 551 | _removeCurrentsFromItems: function() { |
553 | 552 | |
554 | | - var list = this.currentItem.find(":data(sortable-item)"); |
| 553 | + var list = this.currentItem.find(":data(" + this.widgetName + "-item)"); |
555 | 554 | |
556 | 555 | for (var i=0; i < this.items.length; i++) { |
557 | 556 | |
— | — | @@ -576,7 +575,7 @@ |
577 | 576 | for (var i = connectWith.length - 1; i >= 0; i--){ |
578 | 577 | var cur = $(connectWith[i]); |
579 | 578 | for (var j = cur.length - 1; j >= 0; j--){ |
580 | | - var inst = $.data(cur[j], 'sortable'); |
| 579 | + var inst = $.data(cur[j], this.widgetName); |
581 | 580 | if(inst && inst != this && !inst.options.disabled) { |
582 | 581 | queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]); |
583 | 582 | this.containers.push(inst); |
— | — | @@ -592,7 +591,7 @@ |
593 | 592 | for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) { |
594 | 593 | var item = $(_queries[j]); |
595 | 594 | |
596 | | - item.data('sortable-item', targetData); // Data for target checking (mouse manager) |
| 595 | + item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager) |
597 | 596 | |
598 | 597 | items.push({ |
599 | 598 | item: item, |
— | — | @@ -1071,7 +1070,7 @@ |
1072 | 1071 | }); |
1073 | 1072 | |
1074 | 1073 | $.extend($.ui.sortable, { |
1075 | | - version: "1.8.16" |
| 1074 | + version: "1.8.17" |
1076 | 1075 | }); |
1077 | 1076 | |
1078 | 1077 | })(jQuery); |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.dialog.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Dialog 1.8.16 |
| 3 | + * jQuery UI Dialog 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.resizable.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Resizable 1.8.16 |
| 3 | + * jQuery UI Resizable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.accordion.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Accordion 1.8.16 |
| 3 | + * jQuery UI Accordion 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Autocomplete 1.8.16 |
| 3 | + * jQuery UI Autocomplete 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -13,7 +13,7 @@ |
14 | 14 | * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ |
15 | 15 | |
16 | 16 | /* |
17 | | - * jQuery UI Menu 1.8.16 |
| 17 | + * jQuery UI Menu 1.8.17 |
18 | 18 | * |
19 | 19 | * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) |
20 | 20 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.slider.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Slider 1.8.16 |
| 3 | + * jQuery UI Slider 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.theme.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI CSS Framework 1.8.16 |
| 3 | + * jQuery UI CSS Framework 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.selectable.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Selectable 1.8.16 |
| 3 | + * jQuery UI Selectable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.core.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI CSS Framework 1.8.16 |
| 3 | + * jQuery UI CSS Framework 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -13,12 +13,9 @@ |
14 | 14 | .ui-helper-hidden { display: none; } |
15 | 15 | .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } |
16 | 16 | .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } |
17 | | -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } |
18 | | -.ui-helper-clearfix { display: inline-block; } |
19 | | -/* required comment for clearfix to work in Opera \*/ |
20 | | -* html .ui-helper-clearfix { height:1%; } |
21 | | -.ui-helper-clearfix { display:block; } |
22 | | -/* end clearfix */ |
| 17 | +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } |
| 18 | +.ui-helper-clearfix:after { clear: both; } |
| 19 | +.ui-helper-clearfix { zoom: 1; } |
23 | 20 | .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } |
24 | 21 | |
25 | 22 | |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.progressbar.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Progressbar 1.8.16 |
| 3 | + * jQuery UI Progressbar 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -7,5 +7,5 @@ |
8 | 8 | * |
9 | 9 | * http://docs.jquery.com/UI/Progressbar#theming |
10 | 10 | */ |
11 | | -.ui-progressbar { height:2em; text-align: left; } |
| 11 | +.ui-progressbar { height:2em; text-align: left; overflow: hidden; } |
12 | 12 | .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } |
\ No newline at end of file |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.tabs.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Tabs 1.8.16 |
| 3 | + * jQuery UI Tabs 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.button.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Button 1.8.16 |
| 3 | + * jQuery UI Button 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/themes/default/jquery.ui.datepicker.css |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Datepicker 1.8.16 |
| 3 | + * jQuery UI Datepicker 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.resizable.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Resizable 1.8.16 |
| 3 | + * jQuery UI Resizable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -549,7 +549,7 @@ |
550 | 550 | }); |
551 | 551 | |
552 | 552 | $.extend($.ui.resizable, { |
553 | | - version: "1.8.16" |
| 553 | + version: "1.8.17" |
554 | 554 | }); |
555 | 555 | |
556 | 556 | /* |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.slider.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Slider 1.8.16 |
| 3 | + * jQuery UI Slider 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -660,7 +660,7 @@ |
661 | 661 | }); |
662 | 662 | |
663 | 663 | $.extend( $.ui.slider, { |
664 | | - version: "1.8.16" |
| 664 | + version: "1.8.17" |
665 | 665 | }); |
666 | 666 | |
667 | 667 | }(jQuery)); |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.widget.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /*! |
3 | | - * jQuery UI Widget 1.8.16 |
| 3 | + * jQuery UI Widget 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -239,21 +239,25 @@ |
240 | 240 | }, |
241 | 241 | |
242 | 242 | _trigger: function( type, event, data ) { |
243 | | - var callback = this.options[ type ]; |
| 243 | + var prop, orig, |
| 244 | + callback = this.options[ type ]; |
244 | 245 | |
| 246 | + data = data || {}; |
245 | 247 | event = $.Event( event ); |
246 | 248 | event.type = ( type === this.widgetEventPrefix ? |
247 | 249 | type : |
248 | 250 | this.widgetEventPrefix + type ).toLowerCase(); |
249 | | - data = data || {}; |
| 251 | + // the original event may come from any element |
| 252 | + // so we need to reset the target on the new event |
| 253 | + event.target = this.element[ 0 ]; |
250 | 254 | |
251 | 255 | // copy original event properties over to the new event |
252 | | - // this would happen if we could call $.event.fix instead of $.Event |
253 | | - // but we don't have a way to force an event to be fixed multiple times |
254 | | - if ( event.originalEvent ) { |
255 | | - for ( var i = $.event.props.length, prop; i; ) { |
256 | | - prop = $.event.props[ --i ]; |
257 | | - event[ prop ] = event.originalEvent[ prop ]; |
| 256 | + orig = event.originalEvent; |
| 257 | + if ( orig ) { |
| 258 | + for ( prop in orig ) { |
| 259 | + if ( !( prop in event ) ) { |
| 260 | + event[ prop ] = orig[ prop ]; |
| 261 | + } |
258 | 262 | } |
259 | 263 | } |
260 | 264 | |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.core.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /*! |
3 | | - * jQuery UI 1.8.16 |
| 3 | + * jQuery UI 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -18,7 +18,7 @@ |
19 | 19 | } |
20 | 20 | |
21 | 21 | $.extend( $.ui, { |
22 | | - version: "1.8.16", |
| 22 | + version: "1.8.17", |
23 | 23 | |
24 | 24 | keyCode: { |
25 | 25 | ALT: 18, |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.mouse.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /*! |
3 | | - * jQuery UI Mouse 1.8.16 |
| 3 | + * jQuery UI Mouse 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.tabs.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Tabs 1.8.16 |
| 3 | + * jQuery UI Tabs 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -698,7 +698,7 @@ |
699 | 699 | }); |
700 | 700 | |
701 | 701 | $.extend( $.ui.tabs, { |
702 | | - version: "1.8.16" |
| 702 | + version: "1.8.17" |
703 | 703 | }); |
704 | 704 | |
705 | 705 | /* |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.progressbar.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Progressbar 1.8.16 |
| 3 | + * jQuery UI Progressbar 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -103,7 +103,7 @@ |
104 | 104 | }); |
105 | 105 | |
106 | 106 | $.extend( $.ui.progressbar, { |
107 | | - version: "1.8.16" |
| 107 | + version: "1.8.17" |
108 | 108 | }); |
109 | 109 | |
110 | 110 | })( jQuery ); |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.dialog.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Dialog 1.8.16 |
| 3 | + * jQuery UI Dialog 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -329,9 +329,9 @@ |
330 | 330 | self.moveToTop(true); |
331 | 331 | |
332 | 332 | // prevent tabbing out of modal dialogs |
333 | | - if (options.modal) { |
334 | | - uiDialog.bind('keypress.ui-dialog', function(event) { |
335 | | - if (event.keyCode !== $.ui.keyCode.TAB) { |
| 333 | + if ( options.modal ) { |
| 334 | + uiDialog.bind( "keydown.ui-dialog", function( event ) { |
| 335 | + if ( event.keyCode !== $.ui.keyCode.TAB ) { |
336 | 336 | return; |
337 | 337 | } |
338 | 338 | |
— | — | @@ -702,7 +702,7 @@ |
703 | 703 | }); |
704 | 704 | |
705 | 705 | $.extend($.ui.dialog, { |
706 | | - version: "1.8.16", |
| 706 | + version: "1.8.17", |
707 | 707 | |
708 | 708 | uuid: 0, |
709 | 709 | maxZ: 0, |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.accordion.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Accordion 1.8.16 |
| 3 | + * jQuery UI Accordion 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -518,7 +518,7 @@ |
519 | 519 | }); |
520 | 520 | |
521 | 521 | $.extend( $.ui.accordion, { |
522 | | - version: "1.8.16", |
| 522 | + version: "1.8.17", |
523 | 523 | animations: { |
524 | 524 | slide: function( options, additions ) { |
525 | 525 | options = $.extend({ |
— | — | @@ -550,11 +550,11 @@ |
551 | 551 | // fix width before calculating height of hidden element |
552 | 552 | var s = options.toShow; |
553 | 553 | originalWidth = s[0].style.width; |
554 | | - s.width( parseInt( s.parent().width(), 10 ) |
555 | | - - parseInt( s.css( "paddingLeft" ), 10 ) |
556 | | - - parseInt( s.css( "paddingRight" ), 10 ) |
557 | | - - ( parseInt( s.css( "borderLeftWidth" ), 10 ) || 0 ) |
558 | | - - ( parseInt( s.css( "borderRightWidth" ), 10) || 0 ) ); |
| 554 | + s.width( s.parent().width() |
| 555 | + - parseFloat( s.css( "paddingLeft" ) ) |
| 556 | + - parseFloat( s.css( "paddingRight" ) ) |
| 557 | + - ( parseFloat( s.css( "borderLeftWidth" ) ) || 0 ) |
| 558 | + - ( parseFloat( s.css( "borderRightWidth" ) ) || 0 ) ); |
559 | 559 | |
560 | 560 | $.each( fxAttrs, function( i, prop ) { |
561 | 561 | hideProps[ prop ] = "hide"; |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.autocomplete.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Autocomplete 1.8.16 |
| 3 | + * jQuery UI Autocomplete 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -215,6 +215,13 @@ |
216 | 216 | if ( $.fn.bgiframe ) { |
217 | 217 | this.menu.element.bgiframe(); |
218 | 218 | } |
| 219 | + // turning off autocomplete prevents the browser from remembering the |
| 220 | + // value when navigating through history, so we re-enable autocomplete |
| 221 | + // if the page is unloaded before the widget is destroyed. #7790 |
| 222 | + self.beforeunloadHandler = function() { |
| 223 | + self.element.removeAttr( "autocomplete" ); |
| 224 | + }; |
| 225 | + $( window ).bind( "beforeunload", self.beforeunloadHandler ); |
219 | 226 | }, |
220 | 227 | |
221 | 228 | destroy: function() { |
— | — | @@ -225,6 +232,7 @@ |
226 | 233 | .removeAttr( "aria-autocomplete" ) |
227 | 234 | .removeAttr( "aria-haspopup" ); |
228 | 235 | this.menu.element.remove(); |
| 236 | + $( window ).unbind( "beforeunload", this.beforeunloadHandler ); |
229 | 237 | $.Widget.prototype.destroy.call( this ); |
230 | 238 | }, |
231 | 239 | |
— | — | @@ -375,7 +383,9 @@ |
376 | 384 | _resizeMenu: function() { |
377 | 385 | var ul = this.menu.element; |
378 | 386 | ul.outerWidth( Math.max( |
379 | | - ul.width( "" ).outerWidth(), |
| 387 | + // Firefox wraps long text (possibly a rounding bug) |
| 388 | + // so we add 1px to avoid the wrapping (#7513) |
| 389 | + ul.width( "" ).outerWidth() + 1, |
380 | 390 | this.element.outerWidth() |
381 | 391 | ) ); |
382 | 392 | }, |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.selectable.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Selectable 1.8.16 |
| 3 | + * jQuery UI Selectable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -33,6 +33,7 @@ |
34 | 34 | var selectees; |
35 | 35 | this.refresh = function() { |
36 | 36 | selectees = $(self.options.filter, self.element[0]); |
| 37 | + selectees.addClass("ui-selectee"); |
37 | 38 | selectees.each(function() { |
38 | 39 | var $this = $(this); |
39 | 40 | var pos = $this.offset(); |
— | — | @@ -102,7 +103,7 @@ |
103 | 104 | this.selectees.filter('.ui-selected').each(function() { |
104 | 105 | var selectee = $.data(this, "selectable-item"); |
105 | 106 | selectee.startselected = true; |
106 | | - if (!event.metaKey) { |
| 107 | + if (!event.metaKey && !event.ctrlKey) { |
107 | 108 | selectee.$element.removeClass('ui-selected'); |
108 | 109 | selectee.selected = false; |
109 | 110 | selectee.$element.addClass('ui-unselecting'); |
— | — | @@ -117,7 +118,7 @@ |
118 | 119 | $(event.target).parents().andSelf().each(function() { |
119 | 120 | var selectee = $.data(this, "selectable-item"); |
120 | 121 | if (selectee) { |
121 | | - var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected'); |
| 122 | + var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected'); |
122 | 123 | selectee.$element |
123 | 124 | .removeClass(doSelect ? "ui-unselecting" : "ui-selected") |
124 | 125 | .addClass(doSelect ? "ui-selecting" : "ui-unselecting"); |
— | — | @@ -187,7 +188,7 @@ |
188 | 189 | } else { |
189 | 190 | // UNSELECT |
190 | 191 | if (selectee.selecting) { |
191 | | - if (event.metaKey && selectee.startselected) { |
| 192 | + if ((event.metaKey || event.ctrlKey) && selectee.startselected) { |
192 | 193 | selectee.$element.removeClass('ui-selecting'); |
193 | 194 | selectee.selecting = false; |
194 | 195 | selectee.$element.addClass('ui-selected'); |
— | — | @@ -206,7 +207,7 @@ |
207 | 208 | } |
208 | 209 | } |
209 | 210 | if (selectee.selected) { |
210 | | - if (!event.metaKey && !selectee.startselected) { |
| 211 | + if (!event.metaKey && !event.ctrlKey && !selectee.startselected) { |
211 | 212 | selectee.$element.removeClass('ui-selected'); |
212 | 213 | selectee.selected = false; |
213 | 214 | |
— | — | @@ -260,7 +261,7 @@ |
261 | 262 | }); |
262 | 263 | |
263 | 264 | $.extend($.ui.selectable, { |
264 | | - version: "1.8.16" |
| 265 | + version: "1.8.17" |
265 | 266 | }); |
266 | 267 | |
267 | 268 | })(jQuery); |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.position.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Position 1.8.16 |
| 3 | + * jQuery UI Position 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -14,6 +14,7 @@ |
15 | 15 | var horizontalPositions = /left|center|right/, |
16 | 16 | verticalPositions = /top|center|bottom/, |
17 | 17 | center = "center", |
| 18 | + support = {}, |
18 | 19 | _position = $.fn.position, |
19 | 20 | _offset = $.fn.offset; |
20 | 21 | |
— | — | @@ -121,9 +122,11 @@ |
122 | 123 | position.top -= elemHeight / 2; |
123 | 124 | } |
124 | 125 | |
125 | | - // prevent fractions (see #5280) |
126 | | - position.left = Math.round( position.left ); |
127 | | - position.top = Math.round( position.top ); |
| 126 | + // prevent fractions if jQuery version doesn't support them (see #5280) |
| 127 | + if ( !support.fractions ) { |
| 128 | + position.left = Math.round( position.left ); |
| 129 | + position.top = Math.round( position.top ); |
| 130 | + } |
128 | 131 | |
129 | 132 | collisionPosition = { |
130 | 133 | left: position.left - marginLeft, |
— | — | @@ -249,4 +252,47 @@ |
250 | 253 | }; |
251 | 254 | } |
252 | 255 | |
| 256 | +// fraction support test (older versions of jQuery don't support fractions) |
| 257 | +(function () { |
| 258 | + var body = document.getElementsByTagName( "body" )[ 0 ], |
| 259 | + div = document.createElement( "div" ), |
| 260 | + testElement, testElementParent, testElementStyle, offset, offsetTotal; |
| 261 | + |
| 262 | + //Create a "fake body" for testing based on method used in jQuery.support |
| 263 | + testElement = document.createElement( body ? "div" : "body" ); |
| 264 | + testElementStyle = { |
| 265 | + visibility: "hidden", |
| 266 | + width: 0, |
| 267 | + height: 0, |
| 268 | + border: 0, |
| 269 | + margin: 0, |
| 270 | + background: "none" |
| 271 | + }; |
| 272 | + if ( body ) { |
| 273 | + jQuery.extend( testElementStyle, { |
| 274 | + position: "absolute", |
| 275 | + left: "-1000px", |
| 276 | + top: "-1000px" |
| 277 | + }); |
| 278 | + } |
| 279 | + for ( var i in testElementStyle ) { |
| 280 | + testElement.style[ i ] = testElementStyle[ i ]; |
| 281 | + } |
| 282 | + testElement.appendChild( div ); |
| 283 | + testElementParent = body || document.documentElement; |
| 284 | + testElementParent.insertBefore( testElement, testElementParent.firstChild ); |
| 285 | + |
| 286 | + div.style.cssText = "position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;"; |
| 287 | + |
| 288 | + offset = $( div ).offset( function( _, offset ) { |
| 289 | + return offset; |
| 290 | + }).offset(); |
| 291 | + |
| 292 | + testElement.innerHTML = ""; |
| 293 | + testElementParent.removeChild( testElement ); |
| 294 | + |
| 295 | + offsetTotal = offset.top + offset.left + ( body ? 2000 : 0 ); |
| 296 | + support.fractions = offsetTotal > 21 && offsetTotal < 22; |
| 297 | +})(); |
| 298 | + |
253 | 299 | }( jQuery )); |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.droppable.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Droppable 1.8.16 |
| 3 | + * jQuery UI Droppable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -147,7 +147,7 @@ |
148 | 148 | }); |
149 | 149 | |
150 | 150 | $.extend($.ui.droppable, { |
151 | | - version: "1.8.16" |
| 151 | + version: "1.8.17" |
152 | 152 | }); |
153 | 153 | |
154 | 154 | $.ui.intersect = function(draggable, droppable, toleranceMode) { |
— | — | @@ -227,7 +227,7 @@ |
228 | 228 | |
229 | 229 | if(!this.options) return; |
230 | 230 | if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) |
231 | | - dropped = dropped || this._drop.call(this, event); |
| 231 | + dropped = this._drop.call(this, event) || dropped; |
232 | 232 | |
233 | 233 | if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) { |
234 | 234 | this.isout = 1; this.isover = 0; |
Index: trunk/phase3/resources/jquery.ui/jquery.ui.draggable.js |
— | — | @@ -1,5 +1,5 @@ |
2 | 2 | /* |
3 | | - * jQuery UI Draggable 1.8.16 |
| 3 | + * jQuery UI Draggable 1.8.17 |
4 | 4 | * |
5 | 5 | * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) |
6 | 6 | * Dual licensed under the MIT or GPL Version 2 licenses. |
— | — | @@ -505,7 +505,7 @@ |
506 | 506 | }); |
507 | 507 | |
508 | 508 | $.extend($.ui.draggable, { |
509 | | - version: "1.8.16" |
| 509 | + version: "1.8.17" |
510 | 510 | }); |
511 | 511 | |
512 | 512 | $.ui.plugin.add("draggable", "connectToSortable", { |