aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-04-29 23:40:26 +0200
committerFelix Nagel <info@felixnagel.com>2013-04-29 23:40:26 +0200
commit6640925db2f326932bc7d2ef76f4cd96930e92bd (patch)
treecc45853ac7e22d55ca59de17156ea167ce6f14c8 /ui
parentf96ee5e0488e28445fc4ebcc254dfa10aad2b1c9 (diff)
parent5c0a6aaeb7fac32950ddc44870295d5983ece15d (diff)
downloadjquery-ui-6640925db2f326932bc7d2ef76f4cd96930e92bd.tar.gz
jquery-ui-6640925db2f326932bc7d2ef76f4cd96930e92bd.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.accordion.js1
-rw-r--r--ui/jquery.ui.autocomplete.js35
-rw-r--r--ui/jquery.ui.dialog.js1
-rw-r--r--ui/jquery.ui.menu.js1
-rw-r--r--ui/jquery.ui.slider.js1
-rw-r--r--ui/jquery.ui.sortable.js20
-rw-r--r--ui/jquery.ui.tabs.js1
7 files changed, 30 insertions, 30 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index fc2b6bc57..3b515e314 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -169,7 +169,6 @@ $.widget( "ui.accordion", {
},
_keydown: function( event ) {
- /*jshint maxcomplexity:15*/
if ( event.altKey || event.ctrlKey ) {
return;
}
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 28cfdf2fb..2f303ca6e 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -16,9 +16,6 @@
*/
(function( $, undefined ) {
-// used to prevent race conditions with remote data sources
-var requestIndex = 0;
-
$.widget( "ui.autocomplete", {
version: "@VERSION",
defaultElement: "<input>",
@@ -77,7 +74,6 @@ $.widget( "ui.autocomplete", {
this._on( this.element, {
keydown: function( event ) {
- /*jshint maxcomplexity:15*/
if ( this.element.prop( "readOnly" ) ) {
suppressKeyPress = true;
suppressInput = true;
@@ -142,7 +138,9 @@ $.widget( "ui.autocomplete", {
keypress: function( event ) {
if ( suppressKeyPress ) {
suppressKeyPress = false;
- event.preventDefault();
+ if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+ event.preventDefault();
+ }
return;
}
if ( suppressKeyPressRepeat ) {
@@ -417,21 +415,24 @@ $.widget( "ui.autocomplete", {
this.source( { term: value }, this._response() );
},
- _response: function() {
- var that = this,
- index = ++requestIndex;
+ _response: (function() {
+ var requestIndex = 0;
- return function( content ) {
- if ( index === requestIndex ) {
- that.__response( content );
- }
+ return function() {
+ var index = ++requestIndex;
- that.pending--;
- if ( !that.pending ) {
- that.element.removeClass( "ui-autocomplete-loading" );
- }
+ return $.proxy(function( content ) {
+ if ( index === requestIndex ) {
+ this.__response( content );
+ }
+
+ this.pending--;
+ if ( !this.pending ) {
+ this.element.removeClass( "ui-autocomplete-loading" );
+ }
+ }, this );
};
- },
+ })(),
__response: function( content ) {
if ( content ) {
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 59a7961ed..b01907acf 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -556,7 +556,6 @@ $.widget( "ui.dialog", {
},
_setOption: function( key, value ) {
- /*jshint maxcomplexity:15*/
var isDraggable, isResizable,
uiDialog = this.uiDialog;
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index bdef93248..1c641ebb6 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -174,7 +174,6 @@ $.widget( "ui.menu", {
},
_keydown: function( event ) {
- /*jshint maxcomplexity:20*/
var match, prev, character, skip, regex,
preventDefault = true;
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index 88281240d..ee7b3538f 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -593,7 +593,6 @@ $.widget( "ui.slider", $.ui.mouse, {
_handleEvents: {
keydown: function( event ) {
- /*jshint maxcomplexity:25*/
var allowed, curVal, newVal, step,
index = $( event.target ).data( "ui-slider-handle-index" );
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 7b145159e..c7794f06a 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -15,8 +15,6 @@
*/
(function( $, undefined ) {
-/*jshint loopfunc: true */
-
function isOverAxis( x, reference, size ) {
return ( x > reference ) && ( x < ( reference + size ) );
}
@@ -629,10 +627,11 @@ $.widget("ui.sortable", $.ui.mouse, {
queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+ function addItems() {
+ items.push( this );
+ }
for (i = queries.length - 1; i >= 0; i--){
- queries[i][0].each(function() {
- items.push(this);
- });
+ queries[i][0].each( addItems );
}
return $(items);
@@ -1190,12 +1189,17 @@ $.widget("ui.sortable", $.ui.mouse, {
//Post events to containers
+ function delayEvent( type, instance, container ) {
+ return function( event ) {
+ container._trigger( type, event, instance._uiHash( instance ) );
+ };
+ }
for (i = this.containers.length - 1; i >= 0; i--){
- if(!noPropagation) {
- delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
+ if (!noPropagation) {
+ delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
}
if(this.containers[i].containerCache.over) {
- delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
+ delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
this.containers[i].containerCache.over = 0;
}
}
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 918108d61..992bd41b2 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -150,7 +150,6 @@ $.widget( "ui.tabs", {
},
_tabKeydown: function( event ) {
- /*jshint maxcomplexity:15*/
var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
selectedIndex = this.tabs.index( focusedTab ),
goingForward = true;