diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco
index 8867d3e99..ba266efcc 100755
--- a/server/documents/modules/dropdown.html.eco
+++ b/server/documents/modules/dropdown.html.eco
@@ -599,10 +599,6 @@ type : 'UI Module'
custom function is executed
diff --git a/src/modules/accordion.js b/src/modules/accordion.js
index db6ce4c11..0fce4ab70 100755
--- a/src/modules/accordion.js
+++ b/src/modules/accordion.js
@@ -319,20 +319,20 @@ $.fn.accordion = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/behavior/form.js b/src/modules/behavior/form.js
index 521f37003..73fbf8f22 100755
--- a/src/modules/behavior/form.js
+++ b/src/modules/behavior/form.js
@@ -500,20 +500,20 @@ $.fn.form = function(fields, parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/behavior/state.js b/src/modules/behavior/state.js
index 5815a16cc..54d4e2dee 100755
--- a/src/modules/behavior/state.js
+++ b/src/modules/behavior/state.js
@@ -556,20 +556,20 @@ $.fn.state = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/checkbox.js b/src/modules/checkbox.js
index 6441a0bb9..3dbf8e51b 100755
--- a/src/modules/checkbox.js
+++ b/src/modules/checkbox.js
@@ -250,20 +250,20 @@ $.fn.checkbox = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js
index 8d4cae5a6..d524bcf17 100755
--- a/src/modules/dropdown.js
+++ b/src/modules/dropdown.js
@@ -702,20 +702,20 @@ $.fn.dropdown = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/nag.js b/src/modules/nag.js
index 5bf9935a0..483f887ec 100755
--- a/src/modules/nag.js
+++ b/src/modules/nag.js
@@ -419,20 +419,20 @@ $.fn.nag = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/rating.js b/src/modules/rating.js
index fea6dc317..5fbce6c3f 100755
--- a/src/modules/rating.js
+++ b/src/modules/rating.js
@@ -309,20 +309,20 @@ $.fn.rating = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/search.js b/src/modules/search.js
index 9a912ddcd..0614ebf72 100755
--- a/src/modules/search.js
+++ b/src/modules/search.js
@@ -522,20 +522,20 @@ $.fn.search = function(source, parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/shape.js b/src/modules/shape.js
index 8c938e847..01582326d 100755
--- a/src/modules/shape.js
+++ b/src/modules/shape.js
@@ -677,20 +677,20 @@ $.fn.shape = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/sidebar.js b/src/modules/sidebar.js
index d7f65da79..a82d82b25 100755
--- a/src/modules/sidebar.js
+++ b/src/modules/sidebar.js
@@ -413,20 +413,20 @@ $.fn.sidebar = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;
diff --git a/src/modules/transition.js b/src/modules/transition.js
index f43f7f9a1..daa6f91a0 100755
--- a/src/modules/transition.js
+++ b/src/modules/transition.js
@@ -562,21 +562,22 @@ $.fn.transition = function() {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
+ module.error(error.method);
return false;
}
});
@@ -596,7 +597,7 @@ $.fn.transition = function() {
else if(response !== undefined) {
returnedValue = response;
}
- return found || false;
+ return found;
}
};
module.initialize();
diff --git a/src/modules/video.js b/src/modules/video.js
index 3f83d30b3..af514c032 100755
--- a/src/modules/video.js
+++ b/src/modules/video.js
@@ -348,20 +348,20 @@ $.fn.video = function(parameters) {
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
: query
;
- if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
- instance = instance[value];
- }
- else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+ if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
instance = instance[camelCaseValue];
}
- else if( instance[value] !== undefined ) {
- found = instance[value];
- return false;
- }
else if( instance[camelCaseValue] !== undefined ) {
found = instance[camelCaseValue];
return false;
}
+ else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+ instance = instance[value];
+ }
+ else if( instance[value] !== undefined ) {
+ found = instance[value];
+ return false;
+ }
else {
module.error(error.method);
return false;