June 2014 - Sandbox-commits - mailman.cloud.codelutin.com

r720 - in funjs/public_html: . funjs
by jruchaud＠users.nuiton.org June 26, 2014

June 26, 2014

Author: jruchaud Date: 2014-06-26 14:36:48 +0200 (Thu, 26 Jun 2014) New Revision: 720 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/720 Log: Try link the model ant the view Modified: funjs/public_html/funjs/HtmlUtils.js funjs/public_html/funjs/TemplateEngine.js funjs/public_html/index.html Modified: funjs/public_html/funjs/HtmlUtils.js =================================================================== --- funjs/public_html/funjs/HtmlUtils.js 2014-06-20 14:28:40 UTC (rev 719) +++ funjs/public_html/funjs/HtmlUtils.js 2014-06-26 12:36:48 UTC (rev 720) @@ -10,3 +10,58 @@ $warm = console.warn.bind(console); $nop = new Function(); + +/* + * object.watch polyfill + * + * 2012-04-03 + * + * By Eli Grey, http://eligrey.com + * Public Domain. + * NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + */ + +// object.watch +if (!Object.prototype.watch) { + Object.defineProperty(Object.prototype, "watch", { + enumerable: false + , configurable: true + , writable: false + , value: function (prop, handler) { + var + oldval = this[prop] + , newval = oldval + , getter = function () { + return newval; + } + , setter = function (val) { + oldval = newval; + return newval = handler.call(this, prop, oldval, val); + } + ; + + if (delete this[prop]) { // can't watch constants + Object.defineProperty(this, prop, { + get: getter + , set: setter + , enumerable: true + , configurable: true + }); + } + } + }); +} + +// object.unwatch +if (!Object.prototype.unwatch) { + Object.defineProperty(Object.prototype, "unwatch", { + enumerable: false + , configurable: true + , writable: false + , value: function (prop) { + var val = this[prop]; + delete this[prop]; // remove accessors + this[prop] = val; + } + }); +} \ No newline at end of file Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-20 14:28:40 UTC (rev 719) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-26 12:36:48 UTC (rev 720) @@ -51,6 +51,7 @@ if (datas.ctrl) { this.currentCtrl = new window[datas.ctrl]; this.currentCtrl.node = element; + element.controller = this.currentCtrl; this.currentCtrl.load(); } @@ -93,7 +94,7 @@ } if (datas.if) { - var test = this.parseExpression(datas.if, data); + var test = this.parseExpression(datas.if, data).result; if (test == "false") { element.parentNode.removeChild(element); } @@ -102,16 +103,34 @@ }, parseText: function(element, data) { + var self = this; var text = element.nodeValue; - element.nodeValue = this.parseExpression(text, data); + + var parent = element.parentNode; + + var parsing = this.parseExpression(text, data); + element.nodeValue = parsing.result; + + var variables = parsing.variables; + variables.forEach(function(v) { + data.watch(v, function(prop, oldval, val) { + parent.textContent = text; + + var data = {}; + data[prop] = val; + self.parse(parent, data); + }); + }); }, parseExpression : function(exp, data) { var self = this; + var variables = []; - return exp.replace(this.REGEXP_VAR, function(match, negation, test, conditionMark, values, trueValue, falseValue) { + var result = exp.replace(this.REGEXP_VAR, function(match, negation, test, conditionMark, values, trueValue, falseValue) { var result = self.parseValue(test, data); + variables.push(test); if (values == null) { if (conditionMark == "?" && result == null) { @@ -128,6 +147,11 @@ return result; }); + + return { + variables : variables, + result : result + } }, parseValue : function(value, data) { Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-20 14:28:40 UTC (rev 719) +++ funjs/public_html/index.html 2014-06-26 12:36:48 UTC (rev 720) @@ -20,6 +20,7 @@ <ul> <li data-loop="list" data-loop-var="v" data-loop-index="i">{{i}} {{v}}</li> </ul> + <div>{{name?}}</div> <div data-if="{{test}}">TEST</div> <div data-if="{{!test}}">NO TEST</div> </div> @@ -30,14 +31,16 @@ load : function() { $log("Load BodyCtrl", this.node); - $template.load("hello", "content", { + this.model = { test : true, value : "YES", other : "NO", from : "me", to : "you", + name : "eee", list : ["tutu", "titi", "tata", "toto"] - }); + }; + $template.load("hello", "content", this.model); }, touch : function() { @@ -49,6 +52,16 @@ </head> <body data-ctrl="BodyCtrl"> <h1>Test application</h1> + + <input type="text" data-model="name" value="tutu"> + <div>{{name?}}</div> + + <select id="select"> + <option value="value1">Valeur 1</option> + <option value="value2" selected>Valeur 2</option> + <option value="value3">Valeur 3</option> + </select> + <div id="content" data-click="touch"></div> </body> </html>

1 0

r719 - funjs/public_html
by jruchaud＠users.nuiton.org June 20, 2014

June 20, 2014

Author: jruchaud Date: 2014-06-20 16:28:40 +0200 (Fri, 20 Jun 2014) New Revision: 719 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/719 Log: Add simple test Modified: funjs/public_html/index.html Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-20 14:28:27 UTC (rev 718) +++ funjs/public_html/index.html 2014-06-20 14:28:40 UTC (rev 719) @@ -35,6 +35,7 @@ value : "YES", other : "NO", from : "me", + to : "you", list : ["tutu", "titi", "tata", "toto"] }); },

1 0

r718 - funjs/public_html
by jruchaud＠users.nuiton.org June 20, 2014

June 20, 2014

Author: jruchaud Date: 2014-06-20 16:28:27 +0200 (Fri, 20 Jun 2014) New Revision: 718 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/718 Log: Add simple test Modified: funjs/public_html/index.html Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-20 14:17:05 UTC (rev 717) +++ funjs/public_html/index.html 2014-06-20 14:28:27 UTC (rev 718) @@ -15,7 +15,7 @@ <script id="hello" type="text/html"> <div id="hello"> - <p>Hello World {{from}} to {{to?}}!</p> + <p>Hello World {{from}} to {{to?}} to {{!to?}}!</p> <p>{{test ? value : other}}</p> <ul> <li data-loop="list" data-loop-var="v" data-loop-index="i">{{i}} {{v}}</li> @@ -35,7 +35,6 @@ value : "YES", other : "NO", from : "me", - to : "you", list : ["tutu", "titi", "tata", "toto"] }); },

1 0

r717 - funjs/public_html
by jruchaud＠users.nuiton.org June 20, 2014

June 20, 2014

Author: jruchaud Date: 2014-06-20 16:17:05 +0200 (Fri, 20 Jun 2014) New Revision: 717 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/717 Log: First if implemenation Modified: funjs/public_html/index.html Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-20 14:16:55 UTC (rev 716) +++ funjs/public_html/index.html 2014-06-20 14:17:05 UTC (rev 717) @@ -22,7 +22,6 @@ </ul> <div data-if="{{test}}">TEST</div> <div data-if="{{!test}}">NO TEST</div> - <div></div> </div> </script>

1 0

r716 - in funjs/public_html: . funjs
by jruchaud＠users.nuiton.org June 20, 2014

June 20, 2014

Author: jruchaud Date: 2014-06-20 16:16:55 +0200 (Fri, 20 Jun 2014) New Revision: 716 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/716 Log: First if implemenation Modified: funjs/public_html/funjs/TemplateEngine.js funjs/public_html/index.html Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-20 14:04:06 UTC (rev 715) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-20 14:16:55 UTC (rev 716) @@ -52,7 +52,6 @@ this.currentCtrl = new window[datas.ctrl]; this.currentCtrl.node = element; this.currentCtrl.load(); -// element.crtl = currentCtrl; } if (datas.click && this.currentCtrl) { @@ -94,7 +93,10 @@ } if (datas.if) { - + var test = this.parseExpression(datas.if, data); + if (test == "false") { + element.parentNode.removeChild(element); + } } } }, @@ -116,6 +118,10 @@ result = ""; } + if (negation == "!") { + result = !result; + } + } else { result = negation == "!" ^ result ? self.parseValue(trueValue, data) : self.parseValue(falseValue, data); } Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-20 14:04:06 UTC (rev 715) +++ funjs/public_html/index.html 2014-06-20 14:16:55 UTC (rev 716) @@ -20,6 +20,9 @@ <ul> <li data-loop="list" data-loop-var="v" data-loop-index="i">{{i}} {{v}}</li> </ul> + <div data-if="{{test}}">TEST</div> + <div data-if="{{!test}}">NO TEST</div> + <div></div> </div> </script>

1 0

r715 - in funjs/public_html: . funjs
by jruchaud＠users.nuiton.org June 20, 2014

June 20, 2014

Author: jruchaud Date: 2014-06-20 16:04:06 +0200 (Fri, 20 Jun 2014) New Revision: 715 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/715 Log: First loop implemenation Modified: funjs/public_html/funjs/TemplateEngine.js funjs/public_html/index.html Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-19 11:09:11 UTC (rev 714) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-20 14:04:06 UTC (rev 715) @@ -33,17 +33,18 @@ for (var i = 0; i < l; i++) { var child = children[i]; - + if (child instanceof HTMLElement) { this.parse(child, data); - } else { + } else if (child) { this.parseText(child, data); } } }, parseElement: function(element, data) { + var self = this; var datas = element.dataset; if (datas) { @@ -57,6 +58,44 @@ if (datas.click && this.currentCtrl) { element.onclick = this.currentCtrl[datas.click]; } + + if (datas.loop) { + // Options + var loopVar = datas.loopVar || "item"; + var loopIndex = datas.loopIndex || "index"; + + var fragment = document.createDocumentFragment(); + var wrapper = document.createElement("div"); + fragment.appendChild(wrapper); + + var loop = this.parseValue(datas.loop, data) || []; + var copy = element.outerHTML; + + var index = 0; + loop.forEach(function(item) { + wrapper.innerHTML = copy; + + var child = wrapper.children[0]; + delete child.dataset.loop; + delete child.dataset.loopVar; + delete child.dataset.loopIndex; + fragment.appendChild(child); + + data[loopVar] = item; + data[loopIndex] = index ++; + self.parse(child, data); + }); + fragment.removeChild(wrapper); + + delete data[loopVar]; + delete data[loopIndex]; + + element.parentNode.replaceChild(fragment, element); + } + + if (datas.if) { + + } } }, Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-19 11:09:11 UTC (rev 714) +++ funjs/public_html/index.html 2014-06-20 14:04:06 UTC (rev 715) @@ -17,6 +17,9 @@ <div id="hello"> <p>Hello World {{from}} to {{to?}}!</p> <p>{{test ? value : other}}</p> + <ul> + <li data-loop="list" data-loop-var="v" data-loop-index="i">{{i}} {{v}}</li> + </ul> </div> </script> @@ -30,7 +33,8 @@ value : "YES", other : "NO", from : "me", - to : "you" + to : "you", + list : ["tutu", "titi", "tata", "toto"] }); },

1 0

r714 - in funjs/public_html: . funjs
by jruchaud＠users.nuiton.org June 19, 2014

June 19, 2014

Author: jruchaud Date: 2014-06-19 13:09:11 +0200 (Thu, 19 Jun 2014) New Revision: 714 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/714 Log: Create first controller with click Added: funjs/public_html/funjs/Controller.js Modified: funjs/public_html/funjs/Boot.js funjs/public_html/funjs/HtmlUtils.js funjs/public_html/funjs/TemplateEngine.js funjs/public_html/index.html Modified: funjs/public_html/funjs/Boot.js =================================================================== --- funjs/public_html/funjs/Boot.js 2014-06-19 09:21:00 UTC (rev 713) +++ funjs/public_html/funjs/Boot.js 2014-06-19 11:09:11 UTC (rev 714) @@ -1,2 +1,6 @@ $scriptReader = new TemplateScriptReader(); $template = new TemplateEngine(); + +window.onload = function() { + $template.parse(document.body); +}; Added: funjs/public_html/funjs/Controller.js =================================================================== --- funjs/public_html/funjs/Controller.js (rev 0) +++ funjs/public_html/funjs/Controller.js 2014-06-19 11:09:11 UTC (rev 714) @@ -0,0 +1,5 @@ +Controller = Class.extend({ + + load : $nop + +}); Modified: funjs/public_html/funjs/HtmlUtils.js =================================================================== --- funjs/public_html/funjs/HtmlUtils.js 2014-06-19 09:21:00 UTC (rev 713) +++ funjs/public_html/funjs/HtmlUtils.js 2014-06-19 11:09:11 UTC (rev 714) @@ -8,3 +8,5 @@ $log = console.log.bind(console); $warm = console.warn.bind(console); + +$nop = new Function(); Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-19 09:21:00 UTC (rev 713) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-19 11:09:11 UTC (rev 714) @@ -19,11 +19,13 @@ } element.innerHTML = content; - self.parse(element, data || {}); + self.parse(element, data); }); }, parse: function(root, data) { + data = data || {}; + this.parseElement(root, data); var children = root.childNodes, @@ -42,7 +44,20 @@ }, parseElement: function(element, data) { -// $log("Element", element) + var datas = element.dataset; + if (datas) { + + if (datas.ctrl) { + this.currentCtrl = new window[datas.ctrl]; + this.currentCtrl.node = element; + this.currentCtrl.load(); +// element.crtl = currentCtrl; + } + + if (datas.click && this.currentCtrl) { + element.onclick = this.currentCtrl[datas.click]; + } + } }, parseText: function(element, data) { Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-19 09:21:00 UTC (rev 713) +++ funjs/public_html/index.html 2014-06-19 11:09:11 UTC (rev 714) @@ -9,18 +9,40 @@ <script src="funjs/Deferred.js" type="text/javascript"></script> <script src="funjs/TemplateScriptReader.js" type="text/javascript"></script> <script src="funjs/TemplateEngine.js" type="text/javascript"></script> + <script src="funjs/Controller.js" type="text/javascript"></script> <script src="funjs/Boot.js" type="text/javascript"></script> <script id="hello" type="text/html"> <div id="hello"> - <p>Hello World {{?from}} to {{?to}}!</p> + <p>Hello World {{from}} to {{to?}}!</p> + <p>{{test ? value : other}}</p> </div> </script> + <script type="text/javascript"> + BodyCtrl = Controller.extend({ + load : function() { + $log("Load BodyCtrl", this.node); + + $template.load("hello", "content", { + test : true, + value : "YES", + other : "NO", + from : "me", + to : "you" + }); + }, + + touch : function() { + $log("touch"); + } + }); + </script> + </head> - <body> - <div id="body"></div> - <h1>Empty</h1> + <body data-ctrl="BodyCtrl"> + <h1>Test application</h1> + <div id="content" data-click="touch"></div> </body> </html>

1 0

r713 - funjs/public_html/funjs
by jruchaud＠users.nuiton.org June 19, 2014

June 19, 2014

Author: jruchaud Date: 2014-06-19 11:21:00 +0200 (Thu, 19 Jun 2014) New Revision: 713 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/713 Log: Improve template ternaire expression Modified: funjs/public_html/funjs/TemplateEngine.js Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-18 14:40:19 UTC (rev 712) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-19 09:21:00 UTC (rev 713) @@ -1,6 +1,10 @@ TemplateEngine = Class.extend({ - REGEXP_VAR : /{{(\??)(.+?)}}/g, + // {{test}} + // {{test ?}} + // {{test ? value : other}} + // {{! test ? value : other}} + REGEXP_VAR : /{{\s*(!?)\s*(\w+)\s*(\?)?\s*((\w+)\s*:\s*(\w+))?\s*}}/g, load: function(scriptId, node, data) { var self = this; @@ -43,11 +47,35 @@ parseText: function(element, data) { var text = element.nodeValue; - element.nodeValue = text.replace(this.REGEXP_VAR, function(match, g1, g2) { - if (g1 == "?" && !data[g2]) return ""; // Optionnal value + element.nodeValue = this.parseExpression(text, data); + }, + + parseExpression : function(exp, data) { + var self = this; + + return exp.replace(this.REGEXP_VAR, function(match, negation, test, conditionMark, values, trueValue, falseValue) { - return data[g2]; + var result = self.parseValue(test, data); + + if (values == null) { + if (conditionMark == "?" && result == null) { + result = ""; + } + + } else { + result = negation == "!" ^ result ? self.parseValue(trueValue, data) : self.parseValue(falseValue, data); + } + + return result; }); + }, + + parseValue : function(value, data) { + if (data[value] instanceof Function) { + return data[value].call(data); + } else { + return data[value]; + } } }); \ No newline at end of file

1 0

r712 - in funjs/public_html: . funjs
by jruchaud＠users.nuiton.org June 18, 2014

June 18, 2014

Author: jruchaud Date: 2014-06-18 16:40:19 +0200 (Wed, 18 Jun 2014) New Revision: 712 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/712 Log: Begin parse in template engine with variable Modified: funjs/public_html/funjs/TemplateEngine.js funjs/public_html/index.html Modified: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js 2014-06-18 13:24:07 UTC (rev 711) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-18 14:40:19 UTC (rev 712) @@ -1,17 +1,53 @@ TemplateEngine = Class.extend({ - - load : function(scriptId, node) { + + REGEXP_VAR : /{{(\??)(.+?)}}/g, + + load: function(scriptId, node, data) { + var self = this; + return $scriptReader.read(scriptId) - .done(function(content) { - - if (typeof node == "string") { - var element = $id(node); - } else { - element = node; - } - $log(element) - element.innerHTML = content; + .done(function(content) { + + if (typeof node == "string") { + var element = $id(node); + } else { + element = node; + } + + element.innerHTML = content; + self.parse(element, data || {}); }); + }, + + parse: function(root, data) { + this.parseElement(root, data); + + var children = root.childNodes, + l = children.length; + + for (var i = 0; i < l; i++) { + var child = children[i]; + + if (child instanceof HTMLElement) { + this.parse(child, data); + + } else { + this.parseText(child, data); + } + } + }, + + parseElement: function(element, data) { +// $log("Element", element) + }, + + parseText: function(element, data) { + var text = element.nodeValue; + element.nodeValue = text.replace(this.REGEXP_VAR, function(match, g1, g2) { + if (g1 == "?" && !data[g2]) return ""; // Optionnal value + + return data[g2]; + }); } - + }); \ No newline at end of file Modified: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html 2014-06-18 13:24:07 UTC (rev 711) +++ funjs/public_html/index.html 2014-06-18 14:40:19 UTC (rev 712) @@ -14,7 +14,7 @@ <script id="hello" type="text/html"> <div id="hello"> - <p>Hello World!</p> + <p>Hello World {{?from}} to {{?to}}!</p> </div> </script>

1 0

r711 - in funjs: . nbproject public_html public_html/funjs
by jruchaud＠users.nuiton.org June 18, 2014

June 18, 2014

Author: jruchaud Date: 2014-06-18 15:24:07 +0200 (Wed, 18 Jun 2014) New Revision: 711 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/711 Log: Initial import Added: funjs/config/ funjs/nbproject/ funjs/nbproject/project.properties funjs/nbproject/project.xml funjs/public_html/ funjs/public_html/funjs/ funjs/public_html/funjs/Ajax.js funjs/public_html/funjs/Boot.js funjs/public_html/funjs/Class.js funjs/public_html/funjs/Deferred.js funjs/public_html/funjs/HtmlUtils.js funjs/public_html/funjs/Routing.js funjs/public_html/funjs/TemplateEngine.js funjs/public_html/funjs/TemplateScriptReader.js funjs/public_html/hello_tpl.html funjs/public_html/index.html funjs/test/ Property changes on: funjs/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: funjs/nbproject/project.properties =================================================================== --- funjs/nbproject/project.properties (rev 0) +++ funjs/nbproject/project.properties 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,7 @@ +config.folder=${file.reference.FunJs-config} +file.reference.FunJs-config=config +file.reference.FunJs-public_html=public_html +file.reference.FunJs-test=test +files.encoding=UTF-8 +site.root.folder=${file.reference.FunJs-public_html} +test.folder=${file.reference.FunJs-test} Added: funjs/nbproject/project.xml =================================================================== (Binary files differ) Property changes on: funjs/nbproject/project.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: funjs/public_html/funjs/Ajax.js =================================================================== Added: funjs/public_html/funjs/Boot.js =================================================================== --- funjs/public_html/funjs/Boot.js (rev 0) +++ funjs/public_html/funjs/Boot.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,2 @@ +$scriptReader = new TemplateScriptReader(); +$template = new TemplateEngine(); Added: funjs/public_html/funjs/Class.js =================================================================== --- funjs/public_html/funjs/Class.js (rev 0) +++ funjs/public_html/funjs/Class.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,61 @@ +var Class = function() { + this.init && this.init.apply(this, arguments); +}; + +Class.extend = function(proto) { + var parent = this; + + var child = function() { + this.init && this.init.apply(this, arguments); + }; + child.extend = parent.extend; + + var Wrapper = new Function(); + Wrapper.prototype = parent.prototype; + + var wrapper = new Wrapper(); + for (var key in proto) { + wrapper[key] = proto[key]; + } + + child.prototype = wrapper; + child.prototype.super = wrapper.__proto__; + return child; +}; + +function unitTestsClass() { + + A = Class.extend({ + init : function() { + this.yes = "OK"; + }, + + test : function() { + console.log("test A"); + } + }); + + B = A.extend({ + m : function() { + console.log("test B"); + } + }); + + C = B.extend({ + tutu : 3, + + init : function() { + this.super.init(); + this.var = "my var"; + }, + + test : function() { + console.log(this.super.test()); + console.log("test C"); + } + }); + + a = new A(); + b = new B(); + c = new C(); +} Added: funjs/public_html/funjs/Deferred.js =================================================================== --- funjs/public_html/funjs/Deferred.js (rev 0) +++ funjs/public_html/funjs/Deferred.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,229 @@ +Deferred = Class.extend({ + RESOLVED : 1, + UNDETERMINED : 0, + REJECTED : -1, + + init : function () { + this.dones = []; + this.fails = []; + this.state = this.UNDETERMINED; + }, + + resolve : function () { + if (this.state) return this; + + this.args = arguments; + this.state = this.RESOLVED; + this._executes(this.dones); + + return this; + }, + + reject : function () { + if (this.state) return this; + + this.args = arguments; + this.state = this.REJECTED; + this._executes(this.fails); + + return this; + }, + + done : function (fn) { + if (this.state == this.RESOLVED) { + this._execute(fn); + } else { + this.dones.push(fn); + } + + return this; + }, + + fail : function (fn) { + if (this.state == this.REJECTED) { + this._execute(fn); + } else { + this.fails.push(fn); + } + return this; + }, + + always : function (fn) { + if (this.state) { + this._execute(fn); + } else { + this.dones.push(fn); + this.fails.push(fn); + } + return this; + }, + + _executes : function(fns) { + for (var i = 0, l = fns.length; i < l; i++) { + var fn = fns.shift(); + if (!this._execute(fn)) { + break; + } + } + }, + + _execute : function (fn) { + var r = fn.apply(this, this.args); + + if (r instanceof Deferred) { + r.dones = this.dones.concat(r.dones); + r.fails = this.fails.concat(r.fails); + + if (r.state == this.RESOLVED) { + r._executes(r.dones); + } else if (r.state == this.REJECTED) { + r._executes(r.fails); + } + return false; + + } else if (typeof r != "undefined") { + this.args = [r]; + } + return true; + } + +}); + +function unitTestsDeferred() { + // Test cases + var success = false; + var sep = "-----------------------------------"; + + console.log("*** Deferred - Cases 0 : resolving"); + var a = new Deferred(); + a.done(function(arg) { + console.log("done", arg); + success = true; + }) + .fail(function() { + success = true; + }); + a.resolve("Test 0"); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Cases 1 : rejecting"); + success = false; + var a = new Deferred(); + a.fail(function(arg) { + console.log("done", arg); + success = true; + }) + .done(function() { + success = false; + }); + a.reject("Test 1"); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Case 2 : default chaining"); + success = false; + var a = new Deferred(); + a.done(function(arg) { + console.log("done 1", arg); + }) + .done(console.log.bind(console)) + .done(function(arg) { + success = true; + }) + .fail(function(){ + success = false; + }); + a.resolve("Test 2"); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Case 3 : always (after resolve)"); + success = false; + var a = new Deferred(); + a.done(console.log.bind(console)) + .fail(console.log.bind(console)) + .always(function() { + success = true; + }); + a.resolve("Test 3"); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Case 4 : always (after reject)"); + success = false; + var a = new Deferred(); + a.done(console.log.bind(console)) + .fail(console.log.bind(console)) + .always(function() { + success = true; + }); + a.reject("Test 4"); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Case 5 : chaining and passing value"); + success = false; + var a = new Deferred(); + a.done(function(arg) { + return true; + }) + .done(function (arg) { + success = arg; + }); + a.resolve(); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + + console.log("*** Deferred - Case 6 : chaining and passing deferred"); + success = false; + var a = new Deferred(); + a.done(function(arg) { + return new Deferred().reject(); + }) + .fail(function() { + success = true; + }) + .done(function () { + success = false; + }); + a.resolve(); + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + console.log("*** Deferred - Case 7 : multi calls"); + success = false; + var a = new Deferred(); + a.done(function(arg) { + console.log("done 1"); + }); + a.resolve(); + a.done(function () { + console.log("done 2"); + success = true; + }); + + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + + console.log("*** Deferred - Case 7 : multi calls and different arguments"); + success = false; + var a = new Deferred(); + a.done(function(arg) { + return true; + }); + a.resolve(false); + a.done(function (arg) { + success = arg; + }); + + if (success) console.log("*** Success ***"); else console.log("!!! failure !!!"); + console.log(sep); + +} Added: funjs/public_html/funjs/HtmlUtils.js =================================================================== --- funjs/public_html/funjs/HtmlUtils.js (rev 0) +++ funjs/public_html/funjs/HtmlUtils.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,10 @@ +$id = function(id) { + return document.getElementById(id); +}; + +$tag = function(tag) { + return document.getElementsByTagName(tag); +}; + +$log = console.log.bind(console); +$warm = console.warn.bind(console); Added: funjs/public_html/funjs/Routing.js =================================================================== Added: funjs/public_html/funjs/TemplateEngine.js =================================================================== --- funjs/public_html/funjs/TemplateEngine.js (rev 0) +++ funjs/public_html/funjs/TemplateEngine.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,17 @@ +TemplateEngine = Class.extend({ + + load : function(scriptId, node) { + return $scriptReader.read(scriptId) + .done(function(content) { + + if (typeof node == "string") { + var element = $id(node); + } else { + element = node; + } + $log(element) + element.innerHTML = content; + }); + } + +}); \ No newline at end of file Added: funjs/public_html/funjs/TemplateScriptReader.js =================================================================== --- funjs/public_html/funjs/TemplateScriptReader.js (rev 0) +++ funjs/public_html/funjs/TemplateScriptReader.js 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,8 @@ +TemplateScriptReader = Class.extend({ + + read : function(scriptId) { + var content = $id(scriptId).textContent; + return new Deferred().resolve(content); + } + +}); Added: funjs/public_html/hello_tpl.html =================================================================== --- funjs/public_html/hello_tpl.html (rev 0) +++ funjs/public_html/hello_tpl.html 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,3 @@ +<div id="hello"> + <p>Hello World!</p> +</div> Added: funjs/public_html/index.html =================================================================== --- funjs/public_html/index.html (rev 0) +++ funjs/public_html/index.html 2014-06-18 13:24:07 UTC (rev 711) @@ -0,0 +1,26 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <title>Fun Js Application Test</title> + + <script src="funjs/Class.js" type="text/javascript"></script> + <script src="funjs/HtmlUtils.js" type="text/javascript"></script> + <script src="funjs/Deferred.js" type="text/javascript"></script> + <script src="funjs/TemplateScriptReader.js" type="text/javascript"></script> + <script src="funjs/TemplateEngine.js" type="text/javascript"></script> + + <script src="funjs/Boot.js" type="text/javascript"></script> + + <script id="hello" type="text/html"> + <div id="hello"> + <p>Hello World!</p> + </div> + </script> + + </head> + <body> + <div id="body"></div> + <h1>Empty</h1> + </body> +</html>

1 0