Merge pull request #510 from niphlod/fix/1985

fixes issue 1985
This commit is contained in:
mdipierro
2014-09-29 19:46:01 -05:00
3 changed files with 363 additions and 354 deletions
+8 -5
View File
@@ -262,7 +262,7 @@
form.attr('data-w2p_target', target); form.attr('data-w2p_target', target);
var url = form.attr('action'); var url = form.attr('action');
if ((url === "") || (url === "#")) { if((url === "") || (url === "#") || (typeof url === 'undefined')) {
/* form has no action. Use component url. */ /* form has no action. Use component url. */
url = action; url = action;
} }
@@ -398,7 +398,9 @@
'0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/', '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
'0123456789abcdefghijklmnopqrstuvwxyz'); '0123456789abcdefghijklmnopqrstuvwxyz');
var score = 0, var score = 0,
other = {}, seen = {}, lastset = null, other = {},
seen = {},
lastset = null,
mystringlist = mystring.split(''); mystringlist = mystring.split('');
for(var i = 0; i < mystringlist.length; i++) { /* classify this character */ for(var i = 0; i < mystringlist.length; i++) { /* classify this character */
var c = mystringlist[i], var c = mystringlist[i],
@@ -466,7 +468,9 @@
enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled', enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled',
/* Triggers an event on an element and returns false if the event result is false */ /* Triggers an event on an element and returns false if the event result is false */
fire: function(obj, type, data, target) { fire: function(obj, type, data, target) {
var event = $.Event(type, {'containerTarget': $('#' + target)[0]}); var event = $.Event(type, {
'containerTarget': $('#' + target)[0]
});
obj.trigger(event, data); obj.trigger(event, data);
return event.result !== false; return event.result !== false;
}, },
@@ -680,7 +684,7 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
}, }
} }
/*end of functions */ /*end of functions */
@@ -721,4 +725,3 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy; web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/ */
/* compatibility code - end*/ /* compatibility code - end*/
+8 -5
View File
@@ -262,7 +262,7 @@
form.attr('data-w2p_target', target); form.attr('data-w2p_target', target);
var url = form.attr('action'); var url = form.attr('action');
if ((url === "") || (url === "#")) { if((url === "") || (url === "#") || (typeof url === 'undefined')) {
/* form has no action. Use component url. */ /* form has no action. Use component url. */
url = action; url = action;
} }
@@ -398,7 +398,9 @@
'0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/', '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
'0123456789abcdefghijklmnopqrstuvwxyz'); '0123456789abcdefghijklmnopqrstuvwxyz');
var score = 0, var score = 0,
other = {}, seen = {}, lastset = null, other = {},
seen = {},
lastset = null,
mystringlist = mystring.split(''); mystringlist = mystring.split('');
for(var i = 0; i < mystringlist.length; i++) { /* classify this character */ for(var i = 0; i < mystringlist.length; i++) { /* classify this character */
var c = mystringlist[i], var c = mystringlist[i],
@@ -466,7 +468,9 @@
enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled', enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled',
/* Triggers an event on an element and returns false if the event result is false */ /* Triggers an event on an element and returns false if the event result is false */
fire: function(obj, type, data, target) { fire: function(obj, type, data, target) {
var event = $.Event(type, {'containerTarget': $('#' + target)[0]}); var event = $.Event(type, {
'containerTarget': $('#' + target)[0]
});
obj.trigger(event, data); obj.trigger(event, data);
return event.result !== false; return event.result !== false;
}, },
@@ -680,7 +684,7 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
}, }
} }
/*end of functions */ /*end of functions */
@@ -721,4 +725,3 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy; web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/ */
/* compatibility code - end*/ /* compatibility code - end*/
+8 -5
View File
@@ -262,7 +262,7 @@
form.attr('data-w2p_target', target); form.attr('data-w2p_target', target);
var url = form.attr('action'); var url = form.attr('action');
if ((url === "") || (url === "#")) { if((url === "") || (url === "#") || (typeof url === 'undefined')) {
/* form has no action. Use component url. */ /* form has no action. Use component url. */
url = action; url = action;
} }
@@ -398,7 +398,9 @@
'0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/', '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
'0123456789abcdefghijklmnopqrstuvwxyz'); '0123456789abcdefghijklmnopqrstuvwxyz');
var score = 0, var score = 0,
other = {}, seen = {}, lastset = null, other = {},
seen = {},
lastset = null,
mystringlist = mystring.split(''); mystringlist = mystring.split('');
for(var i = 0; i < mystringlist.length; i++) { /* classify this character */ for(var i = 0; i < mystringlist.length; i++) { /* classify this character */
var c = mystringlist[i], var c = mystringlist[i],
@@ -466,7 +468,9 @@
enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled', enableSelector: 'input:disabled, button:disabled, textarea:disabled, select:disabled',
/* Triggers an event on an element and returns false if the event result is false */ /* Triggers an event on an element and returns false if the event result is false */
fire: function(obj, type, data, target) { fire: function(obj, type, data, target) {
var event = $.Event(type, {'containerTarget': $('#' + target)[0]}); var event = $.Event(type, {
'containerTarget': $('#' + target)[0]
});
obj.trigger(event, data); obj.trigger(event, data);
return event.result !== false; return event.result !== false;
}, },
@@ -680,7 +684,7 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
}, }
} }
/*end of functions */ /*end of functions */
@@ -721,4 +725,3 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy; web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/ */
/* compatibility code - end*/ /* compatibility code - end*/