Changeset 1952
- Timestamp:
- 2011-09-16 13:13:30 (8 months ago)
- Location:
- trunk/modules
- Files:
-
- 14 edited
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-controls.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js (modified) (3 diffs)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-validators.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/date.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/location.js (modified) (2 diffs)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/numeric-range.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/upload.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/validator.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js (modified) (2 diffs)
-
kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js (modified) (4 diffs)
-
kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-validators.js (modified) (2 diffs)
-
kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-date.js (modified) (1 diff)
-
kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-numeric-range.js (modified) (1 diff)
-
kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/locale.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-controls.js
r1948 r1952 212 212 CheckBoxControl.prototype.normaliseValue = function (value) { 213 213 if (value && value.constructor == Boolean && typeof value === 'object') { return value; }// note Boolean object holding false would become true with !! operation 214 return newBoolean(!!value); //anything becomes true, nothing or false becomes false214 return Boolean(!!value); //anything becomes true, nothing or false becomes false 215 215 }; 216 216 -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js
r1948 r1952 47 47 var match = FALSE_REGEX.test(valstr); 48 48 if (match) { 49 return newBoolean(false);49 return Boolean(false); 50 50 } 51 51 } 52 return newBoolean(valstr);52 return Boolean(valstr); 53 53 } 54 54 }, … … 77 77 // no decimals wanted, skip the trailing zeros 78 78 var parts = val.toLocaleString().split($.getDecimalSeparator()); 79 if(parts.length>1 && newNumber(parts[1]) == 0) {79 if(parts.length>1 && Number(parts[1]) == 0) { 80 80 return parts[0]; 81 81 } else { … … 113 113 } 114 114 115 var val = (valstr == null) ? null : newNumber(valstr);115 var val = (valstr == null) ? null : Number(valstr); 116 116 117 117 if (isNaN(val)) { -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-validators.js
r1948 r1952 35 35 36 36 if (typeof value == 'number') { 37 value = newNumber(value);37 value = Number(value); 38 38 } 39 39 -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/date.js
r1948 r1952 35 35 36 36 max = max || 60; // default 37 var num = newNumber(numStr);37 var num = Number(numStr); 38 38 if (isNaN(num) || num > max || num < 0) { 39 39 return undefined; -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/location.js
r1948 r1952 86 86 var val = me.getWireValue(); 87 87 if (val && val.latitude != null && val.longitude != null && val.zoom != null) { 88 var mapVal = {latitude : new Number(val.latitude).valueOf(), longitude : new Number(val.longitude).valueOf(), zoom : newNumber(val.zoom).valueOf()};88 var mapVal = {latitude : Number(val.latitude).valueOf(), longitude : Number(val.longitude).valueOf(), zoom : Number(val.zoom).valueOf()}; 89 89 me.setMapValue(mapVal); 90 90 } … … 106 106 var val = me.getWireValue(); 107 107 if (val && val.latitude != null && val.longitude != null && val.zoom != null) { 108 var mapVal = {latitude : new Number(val.latitude).valueOf(), longitude : new Number(val.longitude).valueOf(), zoom : newNumber(val.zoom).valueOf()};108 var mapVal = {latitude : Number(val.latitude).valueOf(), longitude : Number(val.longitude).valueOf(), zoom : Number(val.zoom).valueOf()}; 109 109 me.setMapValue(mapVal); 110 110 } -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/numeric-range.js
r1948 r1952 52 52 } 53 53 54 start = newNumber(valArr[0]);55 end = newNumber(valArr[1]);54 start = Number(valArr[0]); 55 end = Number(valArr[1]); 56 56 57 57 if (isNaN(start) || isNaN(end)) { -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/upload.js
r1948 r1952 195 195 UploadControl.prototype.humanSize = function(size, level) { 196 196 level = level || 0; 197 var nextOrder = Number( newNumber(size) / 1024).toFixed();197 var nextOrder = Number( Number(size) / 1024).toFixed(); 198 198 if (nextOrder !== "0" && ORDER_SIZES.length > level +1) { 199 199 return this.humanSize(nextOrder, level+1); -
trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/validator.js
r1948 r1952 123 123 ValidationListener.newSequenceId = function() { 124 124 125 return newNumber(Math.random() * 10000).toFixed();125 return Number(Math.random() * 10000).toFixed(); 126 126 }; 127 127 -
trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js
r1929 r1952 176 176 var initial = c.getValue(); 177 177 ok(initial == false, "initially we should be logically false"); 178 ok(initial.constructor == Boolean && typeof initial === 'object', "and the actual type should be nicely converted");178 ok(initial.constructor === Boolean && typeof initial === 'boolean', "and the actual type should be nicely converted to " + typeof initial); 179 179 180 180 // verify creation of control elements … … 211 211 212 212 equal(changes, 2, "receiving 2nd value-change event"); 213 equal(c.hasChanges(), true, "change state");213 equal(c.hasChanges(), false, "no change state"); // changed back to last setWireValue! 214 214 equal($messages.html(), "", "validation error cleared."); 215 215 equal(c.getValue(), okValue, "get-set value match."); -
trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js
r1906 r1952 22 22 var f = getFormatter("true-false"); 23 23 assertConvert(f, "format", undefined, ""); 24 assertConvert(f, "format", newBoolean(true), "true");25 assertConvert(f, "format", newBoolean(false), "false");24 assertConvert(f, "format", Boolean(true), "true"); 25 assertConvert(f, "format", Boolean(false), "false"); 26 26 27 27 assertConvert(f, "parse", "", undefined); … … 41 41 42 42 assertConvert(f, "format", undefined, ""); 43 assertConvert(f, "format", new Boolean(true), newBoolean(true));44 assertConvert(f, "format", new Boolean(false), newBoolean(false));43 assertConvert(f, "format", Boolean(true), Boolean(true)); 44 assertConvert(f, "format", Boolean(false), Boolean(false)); 45 45 46 46 }); … … 54 54 assertConvert(f, "format", undefined, ""); 55 55 assertConvert(f, "parse", "", undefined); 56 assertConvert(f, "format", new Number(9999.9), (newNumber(9999.9)).toLocaleString());57 assertConvert(f, "parse", " 9999.9 ", newNumber(9999.9));56 assertConvert(f, "format", Number(9999.9), (Number(9999.9)).toLocaleString()); 57 assertConvert(f, "parse", " 9999.9 ", Number(9999.9)); 58 58 assertFail(f, "format", "abc"); 59 59 assertFail(f, "parse", "abc"); 60 60 61 61 f.decimal = false; 62 assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", newNumber(1001));63 assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", newNumber(-1001));64 assertConvert(f, "parse", "- 1" + $.getThousandSeparator() + "001", newNumber(-1001));65 assertConvert(f, "format", newNumber(1001), "1" + $.getThousandSeparator() + "001");66 assertConvert(f, "format", newNumber(-1001), "-1" + $.getThousandSeparator() + "001");62 assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", Number(1001)); 63 assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", Number(-1001)); 64 assertConvert(f, "parse", "- 1" + $.getThousandSeparator() + "001", Number(-1001)); 65 assertConvert(f, "format", Number(1001), "1" + $.getThousandSeparator() + "001"); 66 assertConvert(f, "format", Number(-1001), "-1" + $.getThousandSeparator() + "001"); 67 67 68 68 … … 71 71 72 72 assertConvert(f, "format", undefined, ""); 73 assertConvert(f, "format", new Number(9999.9), newNumber(9999.9));73 assertConvert(f, "format", Number(9999.9), Number(9999.9)); 74 74 assertFail(f, "format", "abc"); 75 75 76 assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", newNumber(1001));77 assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", newNumber(-1001));78 assertConvert(f, "format", newNumber(1001), 1001);79 assertConvert(f, "format", newNumber(-1001), -1001);76 assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", Number(1001)); 77 assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", Number(-1001)); 78 assertConvert(f, "format", Number(1001), 1001); 79 assertConvert(f, "format", Number(-1001), -1001); 80 80 81 81 }); -
trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-validators.js
r1898 r1952 3 3 module('Validator logic testing.'); 4 4 5 test("why Number() should not also have 'new'", function(){ 6 var n = Number(5); 7 var o = new Number(5); 8 9 expect(4); 10 11 equals(n,o, "of course 5 is 5"); 12 ok(n!==o, "yet then again not quite"); 13 ok(n.constructor === o.constructor, "Of course the constructor is just " + o.constructor); 14 ok(typeof n !== typeof o, "But the typeof yields " + typeof n + "!==" + typeof o); 15 }); 16 17 5 18 test("isInt", function() { 6 19 … … 9 22 var v = getValidator("isInt"); 10 23 valueCheck(v, undefined, true); 11 valueCheck(v, newNumber(""), true);12 valueCheck(v, newNumber("aa"), false);13 valueCheck(v, newNumber("10.01"), false);14 valueCheck(v, newNumber("10.00"), true);15 valueCheck(v, newNumber("10."), true);16 valueCheck(v, newNumber("10"), true);17 valueCheck(v, newNumber("-10"), true);18 valueCheck(v, newNumber("-0"), true);24 valueCheck(v, Number(""), true); 25 valueCheck(v, Number("aa"), false); 26 valueCheck(v, Number("10.01"), false); 27 valueCheck(v, Number("10.00"), true); 28 valueCheck(v, Number("10."), true); 29 valueCheck(v, Number("10"), true); 30 valueCheck(v, Number("-10"), true); 31 valueCheck(v, Number("-0"), true); 19 32 }); 20 33 -
trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-date.js
r1920 r1952 92 92 valueCheck(v, undefined, true); 93 93 valueCheck(v, new Date(), true); 94 valueCheck(v, newNumber(), false);94 valueCheck(v, Number(), false); 95 95 96 96 valueCheck(v, "", true); -
trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-numeric-range.js
r1896 r1952 9 9 var f = getFormatter("numeric-range"); 10 10 11 var val = {start : new Number(5.5), end : newNumber(9999.9)};12 var valStrFormatted = new Number(5.5).toLocaleString() + " - " + newNumber(9999.9).toLocaleString();13 var valStr = new Number(5.5) + " - " + newNumber(9999.9);11 var val = {start : Number(5.5), end : Number(9999.9)}; 12 var valStrFormatted = Number(5.5).toLocaleString() + " - " + Number(9999.9).toLocaleString(); 13 var valStr = Number(5.5) + " - " + Number(9999.9); 14 14 15 15 assertConvert(f, "format", undefined, ""); -
trunk/modules/kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/locale.js
r1939 r1952 90 90 Locale.numericSeparators = function() { 91 91 92 var s = newNumber(9999.9).toLocaleString();92 var s = Number(9999.9).toLocaleString(); 93 93 var d = ""; 94 94 var t = ".";
Note: See TracChangeset
for help on using the changeset viewer.