diff --git a/js/lib/form-builder-min.js b/js/lib/form-builder-min.js index 8098dc3..6bb2c13 100644 --- a/js/lib/form-builder-min.js +++ b/js/lib/form-builder-min.js @@ -1,26 +1,26 @@ -var ref=function(a,b){for(var e=null;null==e||a.hasOwnProperty(e);)e="$"+(268435456+Math.floor(4026531839*Math.random())).toString(16)+"$";a[e]=b;return e},FormBuilder=function(a){this.form_object=a;this.observer=new MutationObserver(FormBuilder.DOMUpdates)};FormBuilder.prototype={form_object:this.form_object,defs_object:{},parent_element:null,built_form:null,root_element:null,ref_table:{$00000000$:null},ref_assoc:{NULL:"$00000000$"},observer:this.observer,scope:{}}; +var ref=function(a,b){for(var c=null;null==c||a.hasOwnProperty(c);)c="$"+(268435456+Math.floor(4026531839*Math.random())).toString(16)+"$";a[c]=b;return c},FormBuilder=function(a){this.form_object=a;this.observer=new MutationObserver(FormBuilder.DOMUpdates)};FormBuilder.prototype={form_object:this.form_object,defs_object:{},parent_element:null,built_form:null,root_element:null,ref_table:{$00000000$:null},ref_assoc:{NULL:"$00000000$"},observer:this.observer,scope:{}}; FormBuilder.regex={reg_in_key:/^\/\^(.+)\$\/$/,reg_out_val:/\{(\$[1-9])\}/,pri_out_val:/\{([a-z_]+)\}/g,pri_in_key:/^\$([a-z_]+)$/,arr_out_set:/^\{([a-z_]+)\[\]\}$/,arr_out_val:/\{([a-z_]+)([\.:])([a-z_]+)\}/g,arr_in_key:/^\$([a-z_]+)$/,fun_out_val:/^\{([a-z_]+)\(\)\}$/,ref_pri:/^\$[a-f0-9]{8}\$$/};FormBuilder.spread_attr="children next_nodes prev_nodes attributes node_link listeners repeat browse funcs".split(" ");FormBuilder.debug_time=!1;FormBuilder.debug_time_details=!1; -FormBuilder.debugStart=function(a,b){if(1!=b||!FormBuilder.debug_time)if(2!=b||!FormBuilder.debug_time_details)return{type:0};var e="["+parseInt(64424509439*Math.random()).toString(16)+"]";console.time(e);console.group(a);return{type:b,time_r:e,group:a}};FormBuilder.debug=function(a,b){if(1!=b||!FormBuilder.debug_time)if(2!=b||!FormBuilder.debug_time_details)return{type:0};console.debug(a)}; -FormBuilder.debugStop=function(a){if(1!=a.type||!FormBuilder.debug_time)if(2!=a.type||!FormBuilder.debug_time_details)return null;console.timeEnd(a.time_r);console.groupEnd(a.group)};FormBuilder.prototype.add_definition=function(a){var b=FormBuilder.debugStart("FormBuilder.add_definition",1),e;for(e in a)this.defs_object[e]=a[e];FormBuilder.debugStop(b)}; -FormBuilder.prototype.build=function(a){var b=FormBuilder.debugStart("FormBuilder.build",1);a=null==a?{}:a;var e={},c;for(c in a)a[c]=ref(this.ref_table,a[c]),this.ref_assoc[c]=a[c],this.scope["$"+c]=this.ref_assoc[c],e["$"+c]={get:function(a,b){return function(){return a.ref_table[a.scope["$"+b]]}}(this,c),set:function(a,b){return function(c){a.ref_table[a.scope["$"+b]]=c}}(this,c)},propName=null;Object.defineProperties(this,e);this.built_form=JSON.parse(JSON.stringify(this.form_object));this.built_form= -FormBuilder.replaceStatements(this.built_form,a,this.defs_object,this.ref_table,this.ref_assoc);FormBuilder.debugStop(b)};FormBuilder.prototype.update=function(a){var b=FormBuilder.debugStart("FormBuilder.update",1);a=null==a?{}:a;for(var e in a)this.ref_assoc.hasOwnProperty(e)&&(this.ref_table[this.ref_assoc[e]]=a[e]);FormBuilder.debugStop(b)}; +FormBuilder.debugStart=function(a,b){if(1!=b||!FormBuilder.debug_time)if(2!=b||!FormBuilder.debug_time_details)return{type:0};var c="["+parseInt(64424509439*Math.random()).toString(16)+"]";console.time(c);console.group(a);return{type:b,time_r:c,group:a}};FormBuilder.debug=function(a,b){if(1!=b||!FormBuilder.debug_time)if(2!=b||!FormBuilder.debug_time_details)return{type:0};console.debug(a)}; +FormBuilder.debugStop=function(a){if(1!=a.type||!FormBuilder.debug_time)if(2!=a.type||!FormBuilder.debug_time_details)return null;console.timeEnd(a.time_r);console.groupEnd(a.group)};FormBuilder.prototype.add_definition=function(a){var b=FormBuilder.debugStart("FormBuilder.add_definition",1),c;for(c in a)this.defs_object[c]=a[c];FormBuilder.debugStop(b)}; +FormBuilder.prototype.build=function(a){var b=FormBuilder.debugStart("FormBuilder.build",1);a=null==a?{}:a;for(var c in a)a[c]=ref(this.ref_table,a[c]),this.ref_assoc[c]=a[c],this.scope["$"+c]=this.ref_assoc[c],this.__defineGetter__("$"+c,function(a,b){return function(){console.log("get: "+c);return a.ref_table[a.scope["$"+b]]}}(this,c)),this.__defineSetter__("$"+c,function(a,b){return function(g){console.log("set: "+c);a.ref_table[a.scope["$"+b]]=g;a.attach()}}(this,c));this.built_form=JSON.parse(JSON.stringify(this.form_object)); +this.built_form=FormBuilder.replaceStatements(this.built_form,a,this.defs_object,this.ref_table,this.ref_assoc);FormBuilder.debugStop(b)};FormBuilder.prototype.update=function(a){var b=FormBuilder.debugStart("FormBuilder.update",1);a=null==a?{}:a;for(var c in a)this.ref_assoc.hasOwnProperty(c)&&(this.ref_table[this.ref_assoc[c]]=a[c]);FormBuilder.debugStop(b)}; FormBuilder.prototype.attach=function(a){var b=FormBuilder.debugStart("FormBuilder.attach",1);if(!(a instanceof Element)&&null===this.parent_element)return!1;this.parent_element=a instanceof Element?a:this.parent_element;this.built_form.hasOwnProperty("dom")&&(this.observer.disconnect(),FormBuilder.detachElements(this.parent_element,this.built_form.dom));FormBuilder.createElements(this.built_form,this.ref_table,this.ref_assoc);FormBuilder.attachElements(this.parent_element,this.built_form.dom);this.observer.observe(this.parent_element, {childList:!0,attributes:!0,characterData:!0,subtree:!0,attributeOldValue:!0,characterDataOldValue:!0});FormBuilder.debugStop(b)};FormBuilder.prototype.getter=function(a){return this.ref_table[this.scope[a]]};FormBuilder.prototype.setter=function(a,b){this.ref_table[this.scope[a]]=b}; -FormBuilder.fetchNodeDefinition=function(a,b){var e=FormBuilder.debugStart("FormBuilder::fetchNodeDefinition",2);FormBuilder.debug('node = "'+a+'"',2);var c,f;r=FormBuilder.regex.reg_in_key;if("undefined"!=typeof b&&b.hasOwnProperty(a))return FormBuilder.debugStop(e),{def:b[a]};for(c in b)if(r.test(c)&&(f=new RegExp(c.slice(1,-1)),f.test(a))){matches={};for(f=1;ff;f++)matches["$"+f]=RegExp["$"+f];FormBuilder.debugStop(e);return{def:b[c],scope:matches}}FormBuilder.debugStop(e);return{}}; -FormBuilder.replaceStatements=function(a,b,e,c,f){var g=FormBuilder.debugStart("FormBuilder::replaceStatements",2);a=a instanceof Object?a:{};b=b instanceof Object?JSON.parse(JSON.stringify(b)):{};var d,h;if(a.hasOwnProperty("scope")&&a.scope instanceof Object)for(d in a.scope)b[d]=a.scope[d];if(a.hasOwnProperty("node")&&"string"==typeof a.node&&(h=FormBuilder.fetchNodeDefinition(a.node,e),h.hasOwnProperty("def")&&(a.node_link=JSON.parse(JSON.stringify(h.def)),h.hasOwnProperty("scope"))))for(d in h.scope)b[d]= -h.scope[d];a.hasOwnProperty("browse")&&(a.browse.hasOwnProperty("array")&&FormBuilder.regex.arr_out_set.test(a.browse.array)?a.browse.id=RegExp.$1:delete a.browse);for(d in a)"string"==typeof a[d]?(a[d]=[a[d]],h=FormBuilder.replaceStatementsFunction(a[d][0],b,c),!1!==h?a[d]=h:(h=FormBuilder.replaceStatementsArray(a[d][0],b,c),!1!==h?a[d]=h:(a[d]=FormBuilder.replaceStatementsRegex(a[d],b),a[d]=FormBuilder.replaceStatementsPrimary(a[d],b),a[d]=FormBuilder.replaceStatementsArrayValue(a[d],b,c,f)))): -"number"===typeof a[d]&&(a[d]=[ref(c,a[d])]);for(d in a)FormBuilder.regex.pri_in_key.test(d)?b[d.substring(1)]=ref(c,a[d]):FormBuilder.regex.arr_in_key.test(d)&&(b[d.substring(2)]=ref(c,a[d]));b=JSON.parse(JSON.stringify(b));for(d in a)if(-1=e.lastIndex);)g=e.lastIndex,f.push(c);for(c=g=0;c",2);FormBuilder.debugStop(c);return a.dom=f}; -FormBuilder.attachElements=function(a,b){var e=FormBuilder.debugStart("FormBuilder::attachElements",2),c,f;for(c in b){for(f in b[c].prev)b[c].prev[f]instanceof Element&&a.appendChild(b[c].prev[f]),b[c].prev[f]instanceof Object&&FormBuilder.attachElements(a,[b[c].prev[f]]);for(f in b[c].node)b[c].node[f]instanceof Element&&a.appendChild(b[c].node[f]),b[c].node[f]instanceof Object&&FormBuilder.attachElements(a,[b[c].node[f]]);for(f in b[c].next)b[c].next[f]instanceof Element&&a.appendChild(b[c].next[f]), -b[c].next[f]instanceof Object&&FormBuilder.attachElements(a,[b[c].next[f]])}FormBuilder.debugStop(e)}; -FormBuilder.detachElements=function(a,b){var e,c;for(e in b){for(c in b[e].prev)b[e].prev[c]instanceof Element&&a.removeChild(b[e].prev[c]),b[e].prev[c]instanceof Object&&FormBuilder.detachElements(a,[b[e].prev[c]]);for(c in b[e].node)b[e].node[c]instanceof Element&&a.removeChild(b[e].node[c]),b[e].node[c]instanceof Object&&FormBuilder.detachElements(a,[b[e].node[c]]);for(c in b[e].next)b[e].next[c]instanceof Element&&a.removeChild(b[e].next[c]),b[e].next[c]instanceof Object&&FormBuilder.detachElements(a, -[b[e].next[c]])}};FormBuilder.applyCSS=function(a,b){for(var e in b)a.style[e]=b[e]};FormBuilder.DOMUpdates=function(a){console.log(a)}; +FormBuilder.fetchNodeDefinition=function(a,b){var c=FormBuilder.debugStart("FormBuilder::fetchNodeDefinition",2);FormBuilder.debug('node = "'+a+'"',2);var e,f;r=FormBuilder.regex.reg_in_key;if("undefined"!=typeof b&&b.hasOwnProperty(a))return FormBuilder.debugStop(c),{def:b[a]};for(e in b)if(r.test(e)&&(f=new RegExp(e.slice(1,-1)),f.test(a))){matches={};for(f=1;ff;f++)matches["$"+f]=RegExp["$"+f];FormBuilder.debugStop(c);return{def:b[e],scope:matches}}FormBuilder.debugStop(c);return{}}; +FormBuilder.replaceStatements=function(a,b,c,e,f){var g=FormBuilder.debugStart("FormBuilder::replaceStatements",2);a=a instanceof Object?a:{};b=b instanceof Object?JSON.parse(JSON.stringify(b)):{};var d,h;if(a.hasOwnProperty("scope")&&a.scope instanceof Object)for(d in a.scope)b[d]=a.scope[d];if(a.hasOwnProperty("node")&&"string"==typeof a.node&&(h=FormBuilder.fetchNodeDefinition(a.node,c),h.hasOwnProperty("def")&&(a.node_link=JSON.parse(JSON.stringify(h.def)),h.hasOwnProperty("scope"))))for(d in h.scope)b[d]= +h.scope[d];a.hasOwnProperty("browse")&&(a.browse.hasOwnProperty("array")&&FormBuilder.regex.arr_out_set.test(a.browse.array)?a.browse.id=RegExp.$1:delete a.browse);for(d in a)"string"==typeof a[d]?(a[d]=[a[d]],h=FormBuilder.replaceStatementsFunction(a[d][0],b,e),!1!==h?a[d]=h:(h=FormBuilder.replaceStatementsArray(a[d][0],b,e),!1!==h?a[d]=h:(a[d]=FormBuilder.replaceStatementsRegex(a[d],b),a[d]=FormBuilder.replaceStatementsPrimary(a[d],b),a[d]=FormBuilder.replaceStatementsArrayValue(a[d],b,e,f)))): +"number"===typeof a[d]&&(a[d]=[ref(e,a[d])]);for(d in a)FormBuilder.regex.pri_in_key.test(d)?b[d.substring(1)]=ref(e,a[d]):FormBuilder.regex.arr_in_key.test(d)&&(b[d.substring(2)]=ref(e,a[d]));b=JSON.parse(JSON.stringify(b));for(d in a)if(-1=c.lastIndex);)g=c.lastIndex,f.push(e);for(e=g=0;e",2);FormBuilder.debugStop(e);return a.dom=f}; +FormBuilder.attachElements=function(a,b){var c=FormBuilder.debugStart("FormBuilder::attachElements",2),e,f;for(e in b){for(f in b[e].prev)b[e].prev[f]instanceof Element&&a.appendChild(b[e].prev[f]),b[e].prev[f]instanceof Object&&FormBuilder.attachElements(a,[b[e].prev[f]]);for(f in b[e].node)b[e].node[f]instanceof Element&&a.appendChild(b[e].node[f]),b[e].node[f]instanceof Object&&FormBuilder.attachElements(a,[b[e].node[f]]);for(f in b[e].next)b[e].next[f]instanceof Element&&a.appendChild(b[e].next[f]), +b[e].next[f]instanceof Object&&FormBuilder.attachElements(a,[b[e].next[f]])}FormBuilder.debugStop(c)}; +FormBuilder.detachElements=function(a,b){var c,e;for(c in b){for(e in b[c].prev)b[c].prev[e]instanceof Element&&a.removeChild(b[c].prev[e]),b[c].prev[e]instanceof Object&&FormBuilder.detachElements(a,[b[c].prev[e]]);for(e in b[c].node)b[c].node[e]instanceof Element&&a.removeChild(b[c].node[e]),b[c].node[e]instanceof Object&&FormBuilder.detachElements(a,[b[c].node[e]]);for(e in b[c].next)b[c].next[e]instanceof Element&&a.removeChild(b[c].next[e]),b[c].next[e]instanceof Object&&FormBuilder.detachElements(a, +[b[c].next[e]])}};FormBuilder.applyCSS=function(a,b){for(var c in b)a.style[c]=b[c]};FormBuilder.DOMUpdates=function(a){console.log(a)}; diff --git a/js/lib/form-builder.js b/js/lib/form-builder.js index 918d4b3..8fb5c4a 100644 --- a/js/lib/form-builder.js +++ b/js/lib/form-builder.js @@ -200,8 +200,6 @@ FormBuilder.prototype.build = function(scope){ /* (1) On initialise le scope vide s'il n'est pas donné */ scope = (scope == null) ? {} : scope; - var properties = {}; - /* (2) On transforme toutes les variables en références */ for( var key in scope ){ @@ -217,25 +215,25 @@ FormBuilder.prototype.build = function(scope){ var fset = function(o, k, v){ o.ref_table[ o.scope['$'+k] ] = v; }; - properties['$'+key] = { - get: (function(o, k){ return function(){ + /* (1) On définit le getter */ + this.__defineGetter__('$'+key, (function(o, k){ return function(){ - return o.ref_table[ o.scope['$'+k] ]; + console.log('get: '+key); + return o.ref_table[ o.scope['$'+k] ]; - }; })(this, key), - set: (function(o, k){ return function(v){ + }; })(this, key) ); - o.ref_table[ o.scope['$'+k] ] = v; + /* (2) On définit le setter */ + this.__defineSetter__('$'+key, (function(o, k){ return function(v){ - }; })(this, key) - }; + console.log('set: '+key); + o.ref_table[ o.scope['$'+k] ] = v; + o.attach(); - - propName = null; + }; })(this, key) ); } - Object.defineProperties(this, properties); /* [1] On clone l'object =========================================================*/