|
184 | 184 | continue; |
185 | 185 | } |
186 | 186 | if (!onlyCheck) { |
187 | | - var arr = Nette.isArray(rule.arg) ? rule.arg : [rule.arg], |
| 187 | + var arr = Array.isArray(rule.arg) ? rule.arg : [rule.arg], |
188 | 188 | message = rule.msg.replace(/%(value|\d+)/g, function(foo, m) { |
189 | 189 | return Nette.getValue(m === 'value' ? curElem : elem.form.elements.namedItem(arr[m].control)); |
190 | 190 | }); |
|
291 | 291 | var elem = errors[i].element, |
292 | 292 | message = errors[i].message; |
293 | 293 |
|
294 | | - if (!Nette.inArray(messages, message)) { |
| 294 | + if (messages.indexOf(message) < 0) { |
295 | 295 | messages.push(message); |
296 | 296 |
|
297 | 297 | if (!focusElem && elem.focus) { |
|
324 | 324 | op = op.replace('::', '_'); |
325 | 325 | op = op.replace(/\\/g, ''); |
326 | 326 |
|
327 | | - var arr = Nette.isArray(arg) ? arg.slice(0) : [arg]; |
| 327 | + var arr = Array.isArray(arg) ? arg.slice(0) : [arg]; |
328 | 328 | if (!preventFiltering) { |
329 | 329 | preventFiltering = true; |
330 | 330 | for (var i = 0, len = arr.length; i < len; i++) { |
|
336 | 336 | preventFiltering = false; |
337 | 337 | } |
338 | 338 | return Nette.validators[op] |
339 | | - ? Nette.validators[op](elem, Nette.isArray(arg) ? arr : arr[0], value.value, value) |
| 339 | + ? Nette.validators[op](elem, Array.isArray(arg) ? arr : arr[0], value.value, value) |
340 | 340 | : null; |
341 | 341 | }; |
342 | 342 |
|
|
347 | 347 | return true; |
348 | 348 | } |
349 | 349 | return val !== '' && val !== false && val !== null |
350 | | - && (!Nette.isArray(val) || !!val.length) |
| 350 | + && (!Array.isArray(val) || !!val.length) |
351 | 351 | && (!window.FileList || !(val instanceof window.FileList) || val.length); |
352 | 352 | }, |
353 | 353 |
|
|
372 | 372 | } |
373 | 373 | } |
374 | 374 |
|
375 | | - val = Nette.isArray(val) ? val : [val]; |
376 | | - arg = Nette.isArray(arg) ? arg : [arg]; |
| 375 | + val = Array.isArray(val) ? val : [val]; |
| 376 | + arg = Array.isArray(arg) ? arg : [arg]; |
377 | 377 | loop: |
378 | 378 | for (var i1 = 0, len1 = val.length; i1 < len1; i1++) { |
379 | 379 | for (var i2 = 0, len2 = arg.length; i2 < len2; i2++) { |
|
420 | 420 | return null; |
421 | 421 | } |
422 | 422 | } |
423 | | - arg = Nette.isArray(arg) ? arg : [arg, arg]; |
| 423 | + arg = Array.isArray(arg) ? arg : [arg, arg]; |
424 | 424 | return (arg[0] === null || val.length >= arg[0]) && (arg[1] === null || val.length <= arg[1]); |
425 | 425 | }, |
426 | 426 |
|
|
532 | 532 | return null; |
533 | 533 | } |
534 | 534 | } |
535 | | - return Nette.isArray(arg) ? |
| 535 | + return Array.isArray(arg) ? |
536 | 536 | ((arg[0] === null || parseFloat(val) >= arg[0]) && (arg[1] === null || parseFloat(val) <= arg[1])) : null; |
537 | 537 | }, |
538 | 538 |
|
|
629 | 629 | if ((rule.rules && Nette.toggleControl(elem, rule.rules, curSuccess, firsttime, value)) || rule.toggle) { |
630 | 630 | has = true; |
631 | 631 | if (firsttime) { |
632 | | - var oldIE = !document.addEventListener, // IE < 9 |
633 | | - name = curElem.tagName ? curElem.name : curElem[0].name, |
| 632 | + var name = curElem.tagName ? curElem.name : curElem[0].name, |
634 | 633 | els = curElem.tagName ? curElem.form.elements : curElem; |
635 | 634 |
|
636 | 635 | for (var i = 0; i < els.length; i++) { |
637 | | - if (els[i].name === name && !Nette.inArray(handled, els[i])) { |
638 | | - Nette.addEvent(els[i], oldIE && els[i].type in {checkbox: 1, radio: 1} ? 'click' : 'change', handler); |
| 636 | + if (els[i].name === name && handled.indexOf(els[i]) < 0) { |
| 637 | + Nette.addEvent(els[i], 'change', handler); |
639 | 638 | handled.push(els[i]); |
640 | 639 | } |
641 | 640 | } |
|
679 | 678 |
|
680 | 679 | Nette.addEvent(form, 'submit', function(e) { |
681 | 680 | if (!Nette.validateForm(form)) { |
682 | | - if (e && e.stopPropagation) { |
683 | | - e.stopPropagation(); |
684 | | - e.preventDefault(); |
685 | | - } else if (window.event) { |
686 | | - event.cancelBubble = true; |
687 | | - event.returnValue = false; |
688 | | - } |
| 681 | + e.stopPropagation(); |
| 682 | + e.preventDefault(); |
689 | 683 | } |
690 | 684 | }); |
691 | 685 | }; |
|
707 | 701 | } |
708 | 702 |
|
709 | 703 | Nette.addEvent(document.body, 'click', function(e) { |
710 | | - var target = e.target || e.srcElement; |
| 704 | + var target = e.target; |
711 | 705 | while (target) { |
712 | 706 | if (target.form && target.type in {submit: 1, image: 1}) { |
713 | 707 | target.form['nette-submittedBy'] = target; |
|
720 | 714 | }; |
721 | 715 |
|
722 | 716 |
|
723 | | - /** |
724 | | - * Determines whether the argument is an array. |
725 | | - */ |
726 | | - Nette.isArray = function(arg) { |
727 | | - return Object.prototype.toString.call(arg) === '[object Array]'; |
728 | | - }; |
729 | | - |
730 | | - |
731 | | - /** |
732 | | - * Search for a specified value within an array. |
733 | | - */ |
734 | | - Nette.inArray = function(arr, val) { |
735 | | - if ([].indexOf) { |
736 | | - return arr.indexOf(val) > -1; |
737 | | - } else { |
738 | | - for (var i = 0; i < arr.length; i++) { |
739 | | - if (arr[i] === val) { |
740 | | - return true; |
741 | | - } |
742 | | - } |
743 | | - return false; |
744 | | - } |
745 | | - }; |
746 | | - |
747 | | - |
748 | 717 | /** |
749 | 718 | * Converts string to web safe characters [a-z0-9-] text. |
750 | 719 | */ |
|
0 commit comments