Changeset 221

Timestamp:

2008-05-13 15:20:08 (5 years ago)

Author:

idbr

Message:

Fixed forms sample

Location:

trunk/modules/kauri-forms/kauri-forms-framework/src/main/resources/KAURI-INF/js

Files:

• basics.js (modified) (3 diffs)
• composite.js (modified) (1 diff)
• field.js (modified) (2 diffs)
• form.js (modified) (24 diffs)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/resources/KAURI-INF/js/basics.js

@@ -112 +112 @@
     }
 
-    BooleanWidgetType.initialize = function(/* WidgetInstance */widgetInstance)
+    BooleanWidgetType.prototype.initialize = function(/* WidgetInstance */widgetInstance)
     {
         if (widgetInstance.getContainer().attr("type") != "checkbox")
@@ -123 +123 @@
 
     // TODO we can probably just remove this...
-    BooleanWidgetType.configure = function(/* WidgetInstance */widgetInstance)
+    BooleanWidgetType.prototype.configure = function(/* WidgetInstance */widgetInstance)
     {
     }
 
-    BooleanWidgetType.getValue = function(/* WidgetInstance */widgetInstance)
+    BooleanWidgetType.prototype.getValue = function(/* WidgetInstance */widgetInstance)
     {
         if (widgetInstance.getContainer().attr("checked") == true)
@@ -135 +135 @@
     }
 
-    BooleanWidgetType.setValue = function(/* WidgetInstance */widgetInstance, value)
+    BooleanWidgetType.prototype.setValue = function(/* WidgetInstance */widgetInstance, value)
     {
         if (value == true || value == "true")

trunk/modules/kauri-forms/kauri-forms-framework/src/main/resources/KAURI-INF/js/composite.js

@@ -145 +145 @@
     }
     
-    CompositeWidgetType.setValue = function(/* WidgetInstance */widgetInstance, value)
+    CompositeWidgetType.prototype.setValue = function(/* WidgetInstance */widgetInstance, value)
     {
         var members = widgetInstance.getType().getMembers();

trunk/modules/kauri-forms/kauri-forms-framework/src/main/resources/KAURI-INF/js/field.js

@@ -136 +136 @@
             return this;
         else
-        {
+        {   
+            
             // clone Type obj
-             var cloneType = $.extend({}, this);
+             //var cloneType = {};
+             //$.extend(/*deep*/true, cloneType, this);
+            //TODO: check why extend doesn't work correctly
+             var cloneType = new cloneObject(this);
 
             /* _DEV_ */kf.debug("extended type");
@@ -184 +188 @@
     }
     
+    function cloneObject(obj)
+    {
+        for (i in obj)
+        {
+            if (obj && obj.constructor == Array)
+            {
+                // Clone an array
+                var clone = [];
+                for ( var i = 0; i < obj.length; i++)
+                {
+                    clone[i] = obj[i];
+                }
+                return clone;
+            } else if (typeof obj[i] == 'object')
+            {
+                this[i] = new cloneObject(obj[i]);
+            } else
+                this[i] = obj[i];
+        }
+    }
+
+    
     /**
      * FieldInstance controls...

trunk/modules/kauri-forms/kauri-forms-framework/src/main/resources/KAURI-INF/js/form.js

@@ -1 @@
-/**  
- * @fileOverview This file holds the classes composing the actual Form structure.
+/**
+ * @fileOverview This file holds the classes composing the actual Form
+ *               structure.
  */
-;(function($){
-    if (!$) throw "Kauri Form & Model requires jQuery";
-    if (!$.org.kauriproject.forms) throw "Kauri Form & Model requires the kauri-form namespace";
-    
-    var kf =  $.org.kauriproject.forms;
+;
+( function($)
+{
+    if (!$)
+        throw "Kauri Form & Model requires jQuery";
+    if (!$.org.kauriproject.forms)
+        throw "Kauri Form & Model requires the kauri-form namespace";
+
+    var kf = $.org.kauriproject.forms;
 
     $.extend(kf, {
-        Model: Model,
-        Form: Form 
-    } );
+        Model :Model,
+        Form :Form
+    });
 
     // TODO think and discuss about a good path location
     var REMOTE_WIDGET_PATH = "/kauri/forms/widgets/load_";
     /* _DEV_ *//* for local test purpose */REMOTE_WIDGET_PATH = "../public/widgets/load_";
-    
-    // TODO more thinking for dynamic loaded fieltypes and validators (if needed) 
-        
+
+    // TODO more thinking for dynamic loaded fieltypes and validators (if
+    // needed)
+
     /**
      * Model holds and controlls ...
      * 
      * TODO document
-     *
+     * 
      * 
      * @constructor
@@ -37 +43 @@
         this.validators = new kf.Registry("Registry for Local Validators", kf.validators);
     }
-    
-    //TODO consider removing these add** methods in favour of direct calls to the registries...
+
+    // TODO consider removing these add** methods in favour of direct calls to
+    // the registries...
     Model.prototype.addWidgetType = function(/* String */name, /* WidgetDefinition */widgetType)
     {
         this.widgetTypes.put(widgetType, name);
     }
-    
+
     Model.prototype.addFieldType = function(/* String */name, /* Type */type)
     {
         this.fieldTypes.put(type, name);
-        // todo check this was here before: needed? 
+        // todo check this was here before: needed?
         // type._name = name;
     }
-    
+
     Model.prototype.addValidator = function(/* String */name, /* function */validator)
     {
         this.validators.put(validator, name);
     }
-    
+
     Model.prototype.setDatatype = function(/* Type */type)
     {
         this._datatype = type;
     }
-    
+
     Model.prototype.getDatatype = function()
     {
         return this._datatype;
     }
-    
-    //TODO consider removing these find** methods in favour of direct calls to the registries...
+
+    // TODO consider removing these find** methods in favour of direct calls to
+    // the registries...
     Model.prototype.findWidgetType = function(/* String */name)
     {
         return this.widgetTypes.get(name);
     }
-    
+
     Model.prototype.findFieldType = function(/* String */name)
     {
         return this.fieldTypes.get(name);
     }
-    
+
     Model.prototype.findValidator = function(/* String */name)
     {
@@ -82 +90 @@
     }
 
-
-    
-    
     /**
      * Form holds and controlls....
@@ -102 +107 @@
             alert("No correct container specified for form.");
         }
-    
+
         this._widgetInstanceInventory = {};
-    
+
         this.formWidgetFQN = "form";
     }
-    
+
     /**
      * Finds a WidgetType by name.
@@ -117 +122 @@
     {
         var localType = this._model.findWidgetType(widgetDefinitionName);
-        if (localType)
-            return localType;
-        else
-            return kf.widgetTypes.get(widgetDefinitionName);
-    }
-    
-    /**
-     * Finds a Type by name.
+        return localType;
+    }
+
+    /**
+     * Finds a FieldType by name.
      * 
      * First search local reg, if nothing found, search global reg
+     * 
+     * @type FieldType
      */
     Form.prototype.findFieldType = function(/* String */typeName)
     {
-      var localType = this._model.findFieldType(typeName);
-      if (localType)
-          return localType;
-      else
-          return kf.fieldTypes.get(typeName);
-    }
-    
-    /**
-     * Finds a Validation method by name.
-     * 
-     * First search local reg, if nothing found, search global reg
+        var localType = this._model.findFieldType(typeName);
+        return localType;
+    }
+
+    /**
+     * Finds a Validator by name.
+     * 
+     * First search local reg, if nothing found, search global reg *
+     * 
+     * @type Validator
      */
     Form.prototype.findValidator = function(/* String */validationName)
@@ -146 +149 @@
         return this._model.findValidator(validationName);
     }
-    
-    
-    //TODO describe/understand what this inventory is?
-    /**
-     * Finds a WidgetInstancein the widgetInstanceInventory by its fully qualified
-     * name.
-     * 
+
+    // TODO describe/understand what this inventory is?
+    /**
+     * Finds a WidgetInstance in the widgetInstanceInventory by its fully
+     * qualified name. The purpose for this registry is widgetbinding.
+     * 
+     * @type WidgetInstance
      */
     Form.prototype.findWidgetInstance = function(/* String */widgetFQN)
@@ -158 +161 @@
         return this._widgetInstanceInventory[widgetFQN];
     }
-    
+
     /**
      * Adds a WidgetInstance to the widgetInstanceInventory
@@ -172 +175 @@
         }
     }
-    
+
     /**
      * Creates a Member from a chunck of data.
@@ -183 +186 @@
         if (!memberdata.type)
             return kf.reportDesignError("Missing type for member '" + name + "'!");
-    
+
         var type = this.findFieldType(memberdata.type);
         if (!type)
             return kf.reportDesignError("Unknown type: '" + memberdata.type + "' for member '" + name + "'!");
-    
+
         // check if widget gets overridden
         var widgetType;
@@ -199 +202 @@
                         + widgetType.getName() + "'!");
         }
-    
+
         // parse validation rules
         var validationRules;
@@ -221 +224 @@
             }
         }
-    
+
         // instantiate Member with possible extensions to type
         var member = new kf.FieldInstance(name, type.extend(widgetType, memberdata.options, undefined, validationRules,
                 memberdata.validationTriggers), ((memberdata.label) ? memberdata.label : ""),
                 ((memberdata.isCollection) ? memberdata.isCollection : false));
-    
+
         return member;
     }
-    
+
     /**
      * Creates a Type from a chunck of data.
@@ -252 +255 @@
                 return kf.reportDesignError("Type not found: '" + typedata.type + "'!");
         }
-    
+
         var widgetType;
         if (typedata.widget)
@@ -260 +263 @@
                 return kf.reportDesignError("WidgetType not found: '" + typedata.widget + "'!");
             if (!widgetType.isTypeCompatible(typedata.type))
-                return kf.reportDesignError("Type '" + typedata.type + "' is not compatible with widget '"
-                        + widgetType.getName() + "'!");
-        }
-    
+                return kf.reportDesignError("Type '" + typedata.type + "' is not compatible with widget '" + widgetType.getName()
+                        + "'!");
+        }
+
         return type.extend(widgetType, typedata.options, {}, typedata.validations);
     }
-    
+
     /**
      * Loads the model data and returns a Model
      * 
-     * order of filling the regs is important: first custom widgets and validations,
-     * than the types
+     * order of filling the regs is important: first custom widgets and
+     * validations, than the types
      */
     Form.prototype.loadModel = function(/* object */formmodeldata)
     {
         var model = this._model;
-    
+
         // load local widget-definitions
         if (formmodeldata.widgets)
@@ -283 +286 @@
             {
                 var widgetdata = formmodeldata.widgets[widgetname];
-                model.widgetTypes.put( 
-                    new kf.WidgetType(
-                        widgetname, 
-                        widgetdata.compatibleTypes,
-                        widgetdata.initFunction, 
-                        widgetdata.configFunction, 
-                        widgetdata.getValueFunction, 
-                        widgetdata.setValueFunction,
-                        widgetdata.events
-                    )
-                );
-            }
-        }
-    
+                model.widgetTypes.put(new kf.WidgetType(widgetname, widgetdata.compatibleTypes, widgetdata.initFunction,
+                        widgetdata.configFunction, widgetdata.getValueFunction, widgetdata.setValueFunction, widgetdata.events));
+            }
+        }
+
         // load local type-definitions
         if (formmodeldata.types)
@@ -303 +297 @@
             {
                 var typedata = formmodeldata.types[typename];
-                model.fieldTypes.put(this.createType(typedata), typename );
-            }
-        }
-    
+                model.fieldTypes.put(this.createType(typedata), typename);
+            }
+        }
+
         // set base composite
         model.setDatatype(this.findFieldType(formmodeldata.datatype));
-    
+
         if (formmodeldata.getDataUri)
             model._getDataURI = new kauri.util.Template(formmodeldata.getDataUri);
         if (formmodeldata.putDataUri)
             model._putDataURI = new kauri.util.Template(formmodeldata.putDataUri);
-    
+
         model._postDataURI = formmodeldata.postDataUri;
-    
+
         return model;
     }
-    
+
     /**
      * Initializes the form by instantiating the widgets and binding the submit
@@ -330 +324 @@
         this.addWidgetInstance(datatype.getWidgetType().createWidgetInstance(this.getContainer(), this, this.formWidgetFQN,
                 datatype));
-    
+
         // configure widgets
         /* _DEV_ */kf.debug("Start config of all widgets");
         this.findWidgetInstance(this.formWidgetFQN).configure();
         /* _DEV_ */kf.debug("End config");
-    
+
         var form = this;
         $(".submit", this.getContainer()).click( function()
@@ -342 +336 @@
         });
     }
-    
+
     /**
      * Sets the data of the form by filling in all the widgets
@@ -359 +353 @@
         }
     }
-    
+
     Form.prototype.setRemoteJsonData = function()
     {
         var form = this;
-        if (form._model._getDataURI && !(function(){for (var p in form._resourceIdObject){return false;} return true;}()))
+        if (form._model._getDataURI && !( function()
+        {
+            for ( var p in form._resourceIdObject)
+            {
+                return false;
+            }
+            return true;
+        }()))
         {
             $.getJSON(form._model._getDataURI.expand(this._resourceIdObject), function(data)
@@ -371 +372 @@
         }
     }
-    
+
     Form.prototype.validate = function()
     {
@@ -379 +380 @@
         return valid;
     }
-    
+
     Form.prototype.submit = function()
     {
@@ -387 +388 @@
             return;
         }
-    
+
         // update data object
         var json = {};
@@ -397 +398 @@
             json[formmembers[i].getName()] = widget.getValue();
         }
-    
+
         // post
         var postUrl;
@@ -404 +405 @@
         else
             postUrl = this._model._postDataURI;
-    
+
         $.ajax( {
             type :"POST",
@@ -420 +421 @@
         });
     }
-    
+
     Form.prototype.getContainer = function()
     {