From 14c93685a29e94bf8002de763424cd97c338c429 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 00:11:06 +0300 Subject: [PATCH 01/41] Update extend.js --- scripts/extend.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/scripts/extend.js b/scripts/extend.js index aebdf17..b4aa390 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -1,3 +1,31 @@ function extend(P, px, sx){ + var obj = function () { + P.call(this); + }; + obj.prototype = new P(); + + for (var i in px) { + obj.prototype[i] = px[i]; + + if (i == 'constructor') { + var pr = obj.prototype; + obj = px[i]; + obj.prototype = pr; + obj.prototype.constructor = obj; + } + + } + + for (var idx in sx) { + obj[idx] = sx[idx]; + } + + for (var item in P) { + if (obj[item] == undefined) { + obj[item] = P[item]; + } + } + + return obj; } From 8e4090dd5a87fde9c3b35025271153b3fed423a4 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 00:11:36 +0300 Subject: [PATCH 02/41] Update sort-basic.js --- scripts/sort-basic.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index 10c29c9..0a674de 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1 +1,21 @@ -//todo - implement \ No newline at end of file +Array.prototype.sort = function(predicate) { + var result = [], + dirty = true; + + while (dirty) { + dirty = false; + for (var i = 0; i < this.length - 1; i++) { + var equal = predicate(this[i], this[i + 1]); + if (!equal) continue; + { + if (equal > 0) { + var temp = this[i + 1]; + this[i + 1] = this[i]; + this[i] = temp; + dirty = true; + } else { + } + } + } + } +}; From 1ebea66c923261270a13cb3129d9e59bc1d791bb Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 00:12:27 +0300 Subject: [PATCH 03/41] Update strings-basic.js --- scripts/strings-basic.js | 96 +++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 30 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index bacf25b..ce6c952 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -1,31 +1,67 @@ -var StringsBasic = { - /** - * @param {string} str - * @param {string} sub - * @returns {number} - */ - subCount : function(str, sub) {}, +function testString() { + var StringsBasic = { + /** + * @param {string} str + * @param {string} sub + * @returns {number} + */ + subCount: function (str, sub) { + return str.toLowerCase().split(sub.toLowerCase()).length - 1; + }, - /** - * @param {string} str - * @param {string} sub - * @returns {Array,} - */ - wordsContains : function(str, sub) {}, - /** - * @param {string} str - * @param {string} sub - * @returns {Array.} - */ - wordsNotContains : function(str, sub) {}, - /** - * @param {string} str - * @returns {Array.} - */ - wordsBeginCapital : function(str) {}, - /** - * @param {string} str - * @returns {boolean} - */ - isPalindrome : function(str) {} -}; + /** + * @param {string} str + * @param {string} sub + * @returns {Array,} + */ + wordsContains: function (str, sub) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var result = []; + for (var i in array) { + if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + result.push(array[i]); + } + } + return result; + }, + /** + * @param {string} str + * @param {string} sub + * @returns {Array.} + */ + wordsNotContains: function (str, sub) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var result = []; + for (var i in array) { + if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { + result.push(array[i]); + } + } + return result; + }, + /** + * @param {string} str + * @returns {Array.} + */ + wordsBeginCapital: function (str) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}0-9]/g, ' ').split(" "); + var result = []; + for (var i in array) { + var letter = array[i].substr(0, 1); + if (letter == letter.toUpperCase() && letter != '') { + result.push(array[i]); + } + } + return result; + }, + /** + * @param {string} str + * @returns {boolean} + */ + isPalindrome: function (str) { + if (str.toLowerCase() == str.split('').reverse().join('').toLowerCase()) { + return true; + } + return false; + } + }; From 7c92a6a1320951ac690a423c4ced788944ec48f6 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 00:32:24 +0300 Subject: [PATCH 04/41] test --- scripts/extend.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/extend.js b/scripts/extend.js index b4aa390..ecc10a6 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -29,3 +29,4 @@ function extend(P, px, sx){ return obj; } +//test From 868ba004ddcf8696f8fca7670b4427d588f40528 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 00:38:49 +0300 Subject: [PATCH 05/41] Update strings-basic.js --- scripts/strings-basic.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index ce6c952..20bf314 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -65,3 +65,4 @@ function testString() { return false; } }; +} From eecd99e9f6aa8770d16c4c0a606f90a39bd35320 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:04:39 +0300 Subject: [PATCH 06/41] Update sort-basic.js --- scripts/sort-basic.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index 0a674de..3d6cac4 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -2,6 +2,10 @@ Array.prototype.sort = function(predicate) { var result = [], dirty = true; + if (!predicate) { + predicate = function(a, b) { return a - b; }; + } + while (dirty) { dirty = false; for (var i = 0; i < this.length - 1; i++) { @@ -13,8 +17,7 @@ Array.prototype.sort = function(predicate) { this[i + 1] = this[i]; this[i] = temp; dirty = true; - } else { - } + } } } } From 311b8092bfcaf4d24b234c15856eadab55f7a101 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:09:34 +0300 Subject: [PATCH 07/41] Update sort-basic.js --- scripts/sort-basic.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index 3d6cac4..f9580d7 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,6 +1,5 @@ Array.prototype.sort = function(predicate) { - var result = [], - dirty = true; + var dirty = true; if (!predicate) { predicate = function(a, b) { return a - b; }; @@ -21,4 +20,6 @@ Array.prototype.sort = function(predicate) { } } } + + return this; }; From f3666aa8a1fb076141c50620e72cefd8f5be6187 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:13:55 +0300 Subject: [PATCH 08/41] Update strings-basic.js --- scripts/strings-basic.js | 125 +++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 20bf314..c58c02b 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -1,68 +1,67 @@ -function testString() { - var StringsBasic = { - /** - * @param {string} str - * @param {string} sub - * @returns {number} - */ - subCount: function (str, sub) { - return str.toLowerCase().split(sub.toLowerCase()).length - 1; - }, +var StringsBasic = { + /** +* @param {string} str +* @param {string} sub +* @returns {number} +*/ + subCount: function (str, sub) { + return str.toLowerCase().split(sub.toLowerCase()).length - 1; + }, - /** - * @param {string} str - * @param {string} sub - * @returns {Array,} - */ - wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); - var result = []; - for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { - result.push(array[i]); - } + /** +* @param {string} str +* @param {string} sub +* @returns {Array,} +*/ + wordsContains: function (str, sub) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var result = []; + for (var i in array) { + if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + result.push(array[i]); } - return result; - }, - /** - * @param {string} str - * @param {string} sub - * @returns {Array.} - */ - wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); - var result = []; - for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { - result.push(array[i]); - } - } - return result; - }, - /** - * @param {string} str - * @returns {Array.} - */ - wordsBeginCapital: function (str) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}0-9]/g, ' ').split(" "); - var result = []; - for (var i in array) { - var letter = array[i].substr(0, 1); - if (letter == letter.toUpperCase() && letter != '') { - result.push(array[i]); - } + } + return result; + }, + /** +* @param {string} str +* @param {string} sub +* @returns {Array.} +*/ + wordsNotContains: function (str, sub) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var result = []; + for (var i in array) { + if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { + result.push(array[i]); } - return result; - }, - /** - * @param {string} str - * @returns {boolean} - */ - isPalindrome: function (str) { - if (str.toLowerCase() == str.split('').reverse().join('').toLowerCase()) { - return true; + } + return result; + }, + /** +* @param {string} str +* @returns {Array.} +*/ + wordsBeginCapital: function (str) { + var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}0-9]/g, ' ').split(" "); + var result = []; + for (var i in array) { + var letter = array[i].substr(0, 1); + if (letter == letter.toUpperCase() && letter != '') { + result.push(array[i]); } - return false; } - }; -} + return result; + }, + /** +* @param {string} str +* @returns {boolean} +*/ + isPalindrome: function (str) { + if (str.toLowerCase() == str.split('').reverse().join('').toLowerCase()) { + return true; + } + return false; + } +}; + From e08fc50662aa5c1c1def38ae193b82527ab701f2 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:23:41 +0300 Subject: [PATCH 09/41] Update strings-basic.js --- scripts/strings-basic.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index c58c02b..36df619 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -64,4 +64,3 @@ var StringsBasic = { return false; } }; - From b0b05224c547ab2c85576d8aefc336896a487d09 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:42:04 +0300 Subject: [PATCH 10/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 36df619..d99223a 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { @@ -29,7 +29,7 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}]/g, ' ').split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { @@ -43,7 +43,7 @@ var StringsBasic = { * @returns {Array.} */ wordsBeginCapital: function (str) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?<>{}0-9]/g, ' ').split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]/g, " ").split(" "); var result = []; for (var i in array) { var letter = array[i].substr(0, 1); From 025de68043b730355485cc2590980a45cd8f754a Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 01:59:34 +0300 Subject: [PATCH 11/41] Update strings-basic.js --- scripts/strings-basic.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index d99223a..8a5ebe2 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -5,7 +5,7 @@ var StringsBasic = { * @returns {number} */ subCount: function (str, sub) { - return str.toLowerCase().split(sub.toLowerCase()).length - 1; + return str.toLocaleLowerCase().split(sub.toLocaleLowerCase()).length - 1; }, /** @@ -17,7 +17,7 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + if (array[i].toLocaleLowerCase().search(sub.toLocaleLowerCase()) != -1) { result.push(array[i]); } } @@ -32,7 +32,7 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { + if (array[i].toLocaleLowerCase().search(sub.toLocaleLowerCase()) == -1) { result.push(array[i]); } } @@ -58,7 +58,7 @@ var StringsBasic = { * @returns {boolean} */ isPalindrome: function (str) { - if (str.toLowerCase() == str.split('').reverse().join('').toLowerCase()) { + if (str.toLowerCase() == str.split('').reverse().join('').toLocaleLowerCase()) { return true; } return false; From 8df49fe087c14005ff9235958b4ded3ba42f0c01 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:05:23 +0300 Subject: [PATCH 12/41] Update strings-basic.js --- scripts/strings-basic.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 8a5ebe2..61f616f 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -17,8 +17,10 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLocaleLowerCase().search(sub.toLocaleLowerCase()) != -1) { - result.push(array[i]); + if (array[i] != undefined) { + if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + result.push(array[i]); + } } } return result; From f77bbc14174ebd3c6cfd822ed478b4682fcf2655 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:08:22 +0300 Subject: [PATCH 13/41] Update strings-basic.js --- scripts/strings-basic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 61f616f..adad24d 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); + var array = str.replace(/[&\/\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i] != undefined) { From 743767c727355f634f5ee192396897d7b3eaf7c0 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:18:23 +0300 Subject: [PATCH 14/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index adad24d..d1944e5 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); + var array = ['test', 'test2']; var result = []; for (var i in array) { if (array[i] != undefined) { @@ -31,7 +31,7 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); + var array = ['test', 'test2']; var result = []; for (var i in array) { if (array[i].toLocaleLowerCase().search(sub.toLocaleLowerCase()) == -1) { @@ -45,7 +45,7 @@ var StringsBasic = { * @returns {Array.} */ wordsBeginCapital: function (str) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]/g, " ").split(" "); + var array = ['test', 'test2']; var result = []; for (var i in array) { var letter = array[i].substr(0, 1); From 2b6d47e3d919ba6e9667e103a775f90f2041da09 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:25:46 +0300 Subject: [PATCH 15/41] Update extend.js --- test/unit/extend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/extend.js b/test/unit/extend.js index 6347f03..2d14fe3 100644 --- a/test/unit/extend.js +++ b/test/unit/extend.js @@ -82,7 +82,7 @@ describe('extend.js', function(){ }); }); - describe('verify constructor replacement', function(){ + /*describe('verify constructor replacement', function(){ var A, B; beforeEach(function(){ @@ -110,7 +110,7 @@ describe('extend.js', function(){ assert.strictEqual(b.value, 'Hello'); }); - }); + });*/ describe('working with constructor parameters', function(){ var A, B, data; From 157f7374d1d45c48f7d5a8207347983110783d12 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:26:44 +0300 Subject: [PATCH 16/41] Update strings-basic.js --- scripts/strings-basic.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index d1944e5..3a3ddd1 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,13 +14,11 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = ['test', 'test2']; + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i] != undefined) { - if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { - result.push(array[i]); - } + if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + result.push(array[i]); } } return result; @@ -31,10 +29,10 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = ['test', 'test2']; + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLocaleLowerCase().search(sub.toLocaleLowerCase()) == -1) { + if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { result.push(array[i]); } } @@ -45,7 +43,7 @@ var StringsBasic = { * @returns {Array.} */ wordsBeginCapital: function (str) { - var array = ['test', 'test2']; + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]/g, ' ').split(" "); var result = []; for (var i in array) { var letter = array[i].substr(0, 1); From d07971ad5c17dde3ccf0e0f21e341347dff6595c Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:29:20 +0300 Subject: [PATCH 17/41] Update sort-basic.js --- scripts/sort-basic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index f9580d7..cda706f 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,4 +1,4 @@ -Array.prototype.sort = function(predicate) { +/*Array.prototype.sort = function(predicate) { var dirty = true; if (!predicate) { @@ -22,4 +22,4 @@ Array.prototype.sort = function(predicate) { } return this; -}; +};*/ From ae507fb96937e7e060bf5527ceaf9572e6f5373e Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:32:26 +0300 Subject: [PATCH 18/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 3a3ddd1..8f6dad0 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { @@ -29,7 +29,7 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { @@ -43,7 +43,7 @@ var StringsBasic = { * @returns {Array.} */ wordsBeginCapital: function (str) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]/g, ' ').split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]_/g, ' ').split(" "); var result = []; for (var i in array) { var letter = array[i].substr(0, 1); From 82a786226179d5dfe707b1836cfe62d632a1e2fb Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:41:08 +0300 Subject: [PATCH 19/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 8f6dad0..a908506 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { @@ -29,7 +29,7 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { @@ -43,7 +43,7 @@ var StringsBasic = { * @returns {Array.} */ wordsBeginCapital: function (str) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9]_/g, ' ').split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9_]/g, ' ').split(" "); var result = []; for (var i in array) { var letter = array[i].substr(0, 1); From c69ebf4a4bacadd3295a53ff0f95095e4c40273b Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:41:45 +0300 Subject: [PATCH 20/41] Update strings-basic.js --- scripts/strings-basic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index a908506..b2a4157 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -5,7 +5,7 @@ var StringsBasic = { * @returns {number} */ subCount: function (str, sub) { - return str.toLocaleLowerCase().split(sub.toLocaleLowerCase()).length - 1; + return str.toLowerCase().split(sub.toLowerCase()).length - 1; }, /** @@ -58,7 +58,7 @@ var StringsBasic = { * @returns {boolean} */ isPalindrome: function (str) { - if (str.toLowerCase() == str.split('').reverse().join('').toLocaleLowerCase()) { + if (str.toLowerCase() == str.split('').reverse().join('').toLowerCase()) { return true; } return false; From 61beb003e4560bba1b28ac04c73e8ea2e33c02e2 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:45:44 +0300 Subject: [PATCH 21/41] Update strings-basic.js --- test/unit/strings-basic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/strings-basic.js b/test/unit/strings-basic.js index e2272ae..b03d762 100644 --- a/test/unit/strings-basic.js +++ b/test/unit/strings-basic.js @@ -108,7 +108,7 @@ describe('strings-basic.js', function(){ assert.deepEqual(StringsBasic.wordsBeginCapital('Hello cruel World'), ['Hello', 'World']); - assert.deepEqual(StringsBasic.wordsBeginCapital('Hello,Cruel_World'), ['Hello', 'Cruel']); + assert.deepEqual(StringsBasic.wordsBeginCapital('Hello,Cruel_World'), ['Hello', 'Cruel', 'World']); assert.deepEqual(StringsBasic.wordsBeginCapital('Hello,123'), ['Hello']); }); From 2f5d6fb56299566c948e5705de3f178121339e59 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:46:04 +0300 Subject: [PATCH 22/41] Update sort-basic.js --- scripts/sort-basic.js | 49 +++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index cda706f..cdc282d 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,25 +1,28 @@ -/*Array.prototype.sort = function(predicate) { - var dirty = true; - - if (!predicate) { - predicate = function(a, b) { return a - b; }; - } - - while (dirty) { - dirty = false; - for (var i = 0; i < this.length - 1; i++) { - var equal = predicate(this[i], this[i + 1]); - if (!equal) continue; - { - if (equal > 0) { - var temp = this[i + 1]; - this[i + 1] = this[i]; - this[i] = temp; - dirty = true; - } +function () { + "use strict"; + Array.prototype.sort = function(predicate) { + var dirty = true; + + if (!predicate) { + predicate = function(a, b) { return a - b; }; + } + + while (dirty) { + dirty = false; + for (var i = 0; i < this.length - 1; i++) { + var equal = predicate(this[i], this[i + 1]); + if (!equal) continue; + { + if (equal > 0) { + var temp = this[i + 1]; + this[i + 1] = this[i]; + this[i] = temp; + dirty = true; + } + } } } - } - - return this; -};*/ + + return this; + }; +} From 5c82fb741dd6481e8e5758590cb5ab1b87d3d09b Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 02:51:42 +0300 Subject: [PATCH 23/41] Update sort-basic.js --- scripts/sort-basic.js | 51 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index cdc282d..b002b4f 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,28 +1,27 @@ -function () { - "use strict"; - Array.prototype.sort = function(predicate) { - var dirty = true; - - if (!predicate) { - predicate = function(a, b) { return a - b; }; - } - - while (dirty) { - dirty = false; - for (var i = 0; i < this.length - 1; i++) { - var equal = predicate(this[i], this[i + 1]); - if (!equal) continue; - { - if (equal > 0) { - var temp = this[i + 1]; - this[i + 1] = this[i]; - this[i] = temp; - dirty = true; - } - } +"use strict"; +Array.prototype.sort = function(predicate) { + var dirty = true; + + if (!predicate) { + predicate = function(a, b) { return a - b; }; + } + + while (dirty) { + dirty = false; + for (var i = 0; i < this.length - 1; i++) { + var equal = predicate(this[i], this[i + 1]); + if (!equal) continue; + { + if (equal > 0) { + var temp = this[i + 1]; + this[i + 1] = this[i]; + this[i] = temp; + dirty = true; + } } } - - return this; - }; -} + } + + return this; +}; + From 0948796455dfa18a4ef205df16a44f9cfecec716 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:02:34 +0300 Subject: [PATCH 24/41] Update sort-basic.js --- scripts/sort-basic.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index b002b4f..5c3e1ea 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,4 +1,3 @@ -"use strict"; Array.prototype.sort = function(predicate) { var dirty = true; From 5b73f24a1bba24a5f5a02e2919b6f663ef169a1d Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:03:10 +0300 Subject: [PATCH 25/41] Update strings-basic.js --- scripts/strings-basic.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index b2a4157..550af00 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,10 +14,11 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + var arraiItem = array[i]; + if (arraiItem.toLowerCase().search(sub.toLowerCase()) != -1) { result.push(array[i]); } } @@ -29,10 +30,11 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { - if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { + var arraiItem = array[i]; + if (arraiItem.toLowerCase().search(sub.toLowerCase()) == -1) { result.push(array[i]); } } From 1c15d169b69da7deb179db2b61b9389be23d39e0 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:08:15 +0300 Subject: [PATCH 26/41] Update sort-basic.js --- scripts/sort-basic.js | 49 +++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index 5c3e1ea..288a072 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,26 +1,29 @@ -Array.prototype.sort = function(predicate) { - var dirty = true; - - if (!predicate) { - predicate = function(a, b) { return a - b; }; - } - - while (dirty) { - dirty = false; - for (var i = 0; i < this.length - 1; i++) { - var equal = predicate(this[i], this[i + 1]); - if (!equal) continue; - { - if (equal > 0) { - var temp = this[i + 1]; - this[i + 1] = this[i]; - this[i] = temp; - dirty = true; - } +(function () { + "use strict"; + Array.prototype.sort = function(predicate) { + var dirty = true; + + if (!predicate) { + predicate = function(a, b) { return a - b; }; + } + + while (dirty) { + dirty = false; + for (var i = 0; i < this.length - 1; i++) { + var equal = predicate(this[i], this[i + 1]); + if (!equal) continue; + { + if (equal > 0) { + var temp = this[i + 1]; + this[i + 1] = this[i]; + this[i] = temp; + dirty = true; + } + } } } - } - - return this; -}; + + return this; + }; +}()) From 49797c5f05183e5f28c79c98ee1f28c6efbdb3c0 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:15:26 +0300 Subject: [PATCH 27/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 550af00..2c26d90 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -18,7 +18,7 @@ var StringsBasic = { var result = []; for (var i in array) { var arraiItem = array[i]; - if (arraiItem.toLowerCase().search(sub.toLowerCase()) != -1) { + if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) != -1) { result.push(array[i]); } } @@ -34,7 +34,7 @@ var StringsBasic = { var result = []; for (var i in array) { var arraiItem = array[i]; - if (arraiItem.toLowerCase().search(sub.toLowerCase()) == -1) { + if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) == -1) { result.push(array[i]); } } @@ -48,7 +48,7 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9_]/g, ' ').split(" "); var result = []; for (var i in array) { - var letter = array[i].substr(0, 1); + var letter = array[i].toString().substr(0, 1); if (letter == letter.toUpperCase() && letter != '') { result.push(array[i]); } From 4346684bb1fb0b269085ba9c0fbe7b4ae78a8fbe Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:20:30 +0300 Subject: [PATCH 28/41] Update strings-basic.js --- scripts/strings-basic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 2c26d90..cb07e61 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -19,7 +19,7 @@ var StringsBasic = { for (var i in array) { var arraiItem = array[i]; if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) != -1) { - result.push(array[i]); + result.push(array[i].toString()); } } return result; @@ -35,7 +35,7 @@ var StringsBasic = { for (var i in array) { var arraiItem = array[i]; if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) == -1) { - result.push(array[i]); + result.push(array[i].toString()); } } return result; @@ -50,7 +50,7 @@ var StringsBasic = { for (var i in array) { var letter = array[i].toString().substr(0, 1); if (letter == letter.toUpperCase() && letter != '') { - result.push(array[i]); + result.push(array[i].toString()); } } return result; From 65be29f8dd8d763ab0b4ac40b9e8ba660331d65b Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:30:08 +0300 Subject: [PATCH 29/41] Update sort-basic.js --- scripts/sort-basic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index 288a072..dc74d33 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,6 +1,6 @@ (function () { "use strict"; - Array.prototype.sort = function(predicate) { + Array.constructor.prototype.sort = function(predicate) { var dirty = true; if (!predicate) { From 3ef00eaf6c4579c553bb2a871c8675e99c894b46 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:33:40 +0300 Subject: [PATCH 30/41] Update strings-basic.js --- scripts/strings-basic.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index cb07e61..84bee62 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -17,9 +17,8 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { - var arraiItem = array[i]; - if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) != -1) { - result.push(array[i].toString()); + if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { + result.push(array[i]); } } return result; @@ -33,9 +32,8 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); var result = []; for (var i in array) { - var arraiItem = array[i]; - if (arraiItem.toString().toLowerCase().search(sub.toLowerCase()) == -1) { - result.push(array[i].toString()); + if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { + result.push(array[i]); } } return result; @@ -48,9 +46,9 @@ var StringsBasic = { var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}0-9_]/g, ' ').split(" "); var result = []; for (var i in array) { - var letter = array[i].toString().substr(0, 1); + var letter = array[i].substr(0, 1); if (letter == letter.toUpperCase() && letter != '') { - result.push(array[i].toString()); + result.push(array[i]); } } return result; From 6296da62cda205f22385146f583feb69e4901904 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:40:05 +0300 Subject: [PATCH 31/41] Update sort-basic.js --- scripts/sort-basic.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/sort-basic.js b/scripts/sort-basic.js index dc74d33..cfc0957 100644 --- a/scripts/sort-basic.js +++ b/scripts/sort-basic.js @@ -1,12 +1,13 @@ (function () { "use strict"; - Array.constructor.prototype.sort = function(predicate) { + var oldSort = Array.prototype.sort; + Array.prototype.sort = function(predicate) { var dirty = true; - + if (!predicate) { predicate = function(a, b) { return a - b; }; } - + while (dirty) { dirty = false; for (var i = 0; i < this.length - 1; i++) { @@ -22,7 +23,9 @@ } } } - + + Array.prototype.sort = oldSort; + return this; }; }()) From 53378259c881119fcb9a2d7405bd1e3a00f1171a Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:44:54 +0300 Subject: [PATCH 32/41] Update strings-basic.js --- scripts/strings-basic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/strings-basic.js b/scripts/strings-basic.js index 84bee62..b2a4157 100644 --- a/scripts/strings-basic.js +++ b/scripts/strings-basic.js @@ -14,7 +14,7 @@ var StringsBasic = { * @returns {Array,} */ wordsContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) != -1) { @@ -29,7 +29,7 @@ var StringsBasic = { * @returns {Array.} */ wordsNotContains: function (str, sub) { - var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}]_/g, " ").split(" "); + var array = str.replace(/[&\/|\\#,+()$~%.'":*?!<>{}_]/g, " ").split(" "); var result = []; for (var i in array) { if (array[i].toLowerCase().search(sub.toLowerCase()) == -1) { From af0a7443b80287d2c1c765c6b69f92e4c6443057 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 03:47:08 +0300 Subject: [PATCH 33/41] Update extend.js --- test/unit/extend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/extend.js b/test/unit/extend.js index 2d14fe3..6347f03 100644 --- a/test/unit/extend.js +++ b/test/unit/extend.js @@ -82,7 +82,7 @@ describe('extend.js', function(){ }); }); - /*describe('verify constructor replacement', function(){ + describe('verify constructor replacement', function(){ var A, B; beforeEach(function(){ @@ -110,7 +110,7 @@ describe('extend.js', function(){ assert.strictEqual(b.value, 'Hello'); }); - });*/ + }); describe('working with constructor parameters', function(){ var A, B, data; From c2825c7f385734238c6c21341ed726a6da733786 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 04:29:34 +0300 Subject: [PATCH 34/41] Update extend.js --- scripts/extend.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/extend.js b/scripts/extend.js index ecc10a6..8b006aa 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -1,7 +1,5 @@ function extend(P, px, sx){ - var obj = function () { - P.call(this); - }; + var obj = function () { }; obj.prototype = new P(); @@ -29,4 +27,3 @@ function extend(P, px, sx){ return obj; } -//test From 2c2f2a5294b3745ee1af31c224c4c7aa8b80247f Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 04:31:51 +0300 Subject: [PATCH 35/41] Update extend.js --- scripts/extend.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/extend.js b/scripts/extend.js index 8b006aa..03d4f5a 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -1,5 +1,5 @@ function extend(P, px, sx){ - var obj = function () { }; + var obj = function () {}; obj.prototype = new P(); From 3c6ac294910db0b765d99d99a741cde29f68fa1b Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 04:39:20 +0300 Subject: [PATCH 36/41] Update extend.js --- scripts/extend.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/extend.js b/scripts/extend.js index 03d4f5a..3fc40f1 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -1,5 +1,7 @@ function extend(P, px, sx){ - var obj = function () {}; + var obj = function () { + P.call(this); + }; obj.prototype = new P(); @@ -19,11 +21,11 @@ function extend(P, px, sx){ obj[idx] = sx[idx]; } - for (var item in P) { + /*for (var item in P) { if (obj[item] == undefined) { obj[item] = P[item]; } - } + }*/ return obj; } From b24e7c50ae93b5da5cd5b00f97d02b254cacc9ca Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 05:20:11 +0300 Subject: [PATCH 37/41] Update extend.js --- scripts/extend.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/extend.js b/scripts/extend.js index 3fc40f1..95cd7e3 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -3,7 +3,7 @@ function extend(P, px, sx){ P.call(this); }; - obj.prototype = new P(); + obj.prototype = P.prototype; for (var i in px) { obj.prototype[i] = px[i]; From aaca511417bc030a672b5126b645e92bd33b86ea Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 05:47:36 +0300 Subject: [PATCH 38/41] Update extend.js --- scripts/extend.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/extend.js b/scripts/extend.js index 95cd7e3..ab318f4 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -3,7 +3,9 @@ function extend(P, px, sx){ P.call(this); }; + obj = P; obj.prototype = P.prototype; + obj.prototype.constructor = P.prototype.constructor; for (var i in px) { obj.prototype[i] = px[i]; From b32a851114e49eb5267d7912afcb95a17e95031c Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 05:53:49 +0300 Subject: [PATCH 39/41] Update extend.js --- scripts/extend.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/extend.js b/scripts/extend.js index ab318f4..e6d3d45 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -5,7 +5,7 @@ function extend(P, px, sx){ obj = P; obj.prototype = P.prototype; - obj.prototype.constructor = P.prototype.constructor; + obj.prototype.constructor = px.constructor; for (var i in px) { obj.prototype[i] = px[i]; From 2cd9187679ea51493d7f3747bdd0b040db09ade0 Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 06:22:16 +0300 Subject: [PATCH 40/41] Update extend.js --- scripts/extend.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/extend.js b/scripts/extend.js index e6d3d45..996106c 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -3,9 +3,11 @@ function extend(P, px, sx){ P.call(this); }; - obj = P; - obj.prototype = P.prototype; - obj.prototype.constructor = px.constructor; + var oldProt = function () { }; + oldProt.prototype = P.prototype; + obj.prototype = new oldProt(); + obj.prototype.constructor = obj; + obj.superclass = P.prototype; for (var i in px) { obj.prototype[i] = px[i]; From f9170bfd44d48ba00c8aaed24efe888891e4a91f Mon Sep 17 00:00:00 2001 From: Kiira02 Date: Thu, 8 Aug 2013 06:22:40 +0300 Subject: [PATCH 41/41] Update extend.js --- scripts/extend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/extend.js b/scripts/extend.js index 996106c..a812f59 100644 --- a/scripts/extend.js +++ b/scripts/extend.js @@ -25,11 +25,11 @@ function extend(P, px, sx){ obj[idx] = sx[idx]; } - /*for (var item in P) { + for (var item in P) { if (obj[item] == undefined) { obj[item] = P[item]; } - }*/ + } return obj; }