Changeset 510 for Dev/trunk/src/client/qed-client/model/classes/_Class.js

Timestamp:

03/12/14 15:16:54 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored out general object mapping and iteration.
• Split widgets for multiplechoice and singlechoice.
• Restored readOnly/disabled setting for QuestionEditorPreviewItem? on innerWidget (since view innerWidget is not a form anymore, we cannot just set it on that, we iterate over all form children now).

File:

• Dev/trunk/src/client/qed-client/model/classes/_Class.js (modified) (4 diffs)

Dev/trunk/src/client/qed-client/model/classes/_Class.js

@@ -1 +1 @@
 define([
+    "../../lib/object",
     "./_View",
     "dojo/_base/array",
@@ -5 +6 @@
     "dojo/_base/lang",
     "dojo/date/stamp"
-], function(_View, array, declare, lang, stamp) {
+], function(objectFuns, _View, array, declare, lang, stamp) {
 
     var _Class = declare([_View],{
@@ -24 +25 @@
             obj = lang.clone(obj);
             obj = this._serialize(obj) || obj;
-            this._strip(obj);
+            this._sanitize(obj);
             return obj;
         },
@@ -65 +66 @@
             return stamp.toISOString(date,{zulu:true,milliseconds:false});
         },
-        _strip: function(obj) {
+        _sanitize: function(obj) {
             if ( lang.isArray(obj) ) {
-                array.forEach(obj,this._strip,this);
+                array.forEach(obj,this._sanitize,this);
             } else if ( lang.isObject(obj) ) {
-                for ( var prop in obj ) {
-                    if ( obj.hasOwnProperty(prop) ) {
-                        var v = obj[prop];
-                        if ( v === null || v === "" || (typeof v === "number" && isNaN(v)) ) {
-                            delete obj[prop];
-                        } else {
-                            this._strip(v);
-                        }
+                objectFuns.forEach(obj,function(v,prop){
+                    if ( v === null ||
+                         v === "" ||
+                         (typeof v === "number" && isNaN(v)) ) {
+                        delete obj[prop];
+                    } else {
+                        this._sanitize(v);
                     }
-                }
+
+                },this);
             }
-
         }
     });