Browse Source

Removes force repaint of dropdowns due to fixes in transition module

pull/474/head
jlukic 11 years ago
parent
commit
be8dd23b3b
1 changed files with 10 additions and 10 deletions
  1. 20
      src/modules/dropdown.js

20
src/modules/dropdown.js

@ -464,7 +464,6 @@ $.fn.dropdown = function(parameters) {
queue : false queue : false
}) })
; ;
$currentMenu.transition('force repaint');
} }
else if(settings.transition == 'slide down') { else if(settings.transition == 'slide down') {
$currentMenu $currentMenu
@ -712,13 +711,14 @@ $.fn.dropdown = function(parameters) {
}, },
invoke: function(query, passedArguments, context) { invoke: function(query, passedArguments, context) {
var var
object = instance,
maxDepth, maxDepth,
found, found,
response response
; ;
passedArguments = passedArguments || queryArguments; passedArguments = passedArguments || queryArguments;
context = element || context; context = element || context;
if(typeof query == 'string' && instance !== undefined) {
if(typeof query == 'string' && object !== undefined) {
query = query.split(/[\. ]/); query = query.split(/[\. ]/);
maxDepth = query.length - 1; maxDepth = query.length - 1;
$.each(query, function(depth, value) { $.each(query, function(depth, value) {
@ -726,18 +726,18 @@ $.fn.dropdown = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1) ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query : query
; ;
if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
if( $.isPlainObject( object[camelCaseValue] ) && (depth != maxDepth) ) {
object = object[camelCaseValue];
} }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
else if( object[camelCaseValue] !== undefined ) {
found = object[camelCaseValue];
return false; return false;
} }
else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
instance = instance[value];
else if( $.isPlainObject( object[value] ) && (depth != maxDepth) ) {
object = object[value];
} }
else if( instance[value] !== undefined ) {
found = instance[value];
else if( object[value] !== undefined ) {
found = object[value];
return false; return false;
} }
else { else {

Loading…
Cancel
Save