[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6103] trunk/UI/lib



Revision: 6103
          http://sourceforge.net/p/ledger-smb/code/6103
Author:   einhverfr
Date:     2013-10-01 08:16:02 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Login screen broken with dojo but still working on it.  Most errors no longer showing.  The current breakage appears to be due to the move from 1.7 to 1.9.  It looks like the issue has to do with differences in TableContainer but not sure.

Modified Paths:
--------------
    trunk/UI/lib/Loader.js
    trunk/UI/lib/TabularForm.js

Modified: trunk/UI/lib/Loader.js
===================================================================
--- trunk/UI/lib/Loader.js	2013-10-01 07:01:18 UTC (rev 6102)
+++ trunk/UI/lib/Loader.js	2013-10-01 08:16:02 UTC (rev 6103)
@@ -21,6 +21,7 @@
     'dojo/parser',
     'dojo/query',
     'dojo/ready',
+    'dijit/_WidgetBase',
     // widgets
     // row1
     'lsmb/lib/TabularForm',
@@ -36,11 +37,11 @@
     ],
 function(
     // base
-    declare, registry, parser, query, ready,
+    declare, registry, parser, query, ready, wbase,
     // widgets
     tabular, textarea, datebox, checkbox, radio, textbox, accountselector, 
     select, button) {
-    return declare(null, {
+    return declare(wbase, {
         nodeMap: { // hierarchy nodeName->class, input type treated as class
                    // for INPUT elements, type beats class.
                DIV: {
@@ -229,6 +230,7 @@
              ready(function(){
                widget = myself.createWidget(dnode);
                if (undefined !== widget){
+                    console.log('startup', dnode);
                     widget.startup();
                }
              });

Modified: trunk/UI/lib/TabularForm.js
===================================================================
--- trunk/UI/lib/TabularForm.js	2013-10-01 07:01:18 UTC (rev 6102)
+++ trunk/UI/lib/TabularForm.js	2013-10-01 08:16:02 UTC (rev 6103)
@@ -67,13 +67,11 @@
     'dijit/layout/ContentPane',
     'dojo/query',
     'dojo/window',
-    'lsmb/lib/Loader',
     'dojo/_base/declare'
     ],
-    function(TableContainer, dom, cls, registry, cp, query, win, ldr, 
+    function(TableContainer, dom, cls, registry, cp, query, win, 
              declare) 
     {
-      console.log(ldr); 
       return declare('lsmb/lib/TabularForm',
         [TableContainer],
         {
@@ -109,16 +107,29 @@
             }); 
         },
         TFRenderElement: function(dnode){
-              console.log('TFRenderElement');
+           var myself = this;
+           require(['lsmb/lib/Loader', 'dojo/ready'],
+           function(l, ready){
+            ready(function(){
+              if (registry.byId(dnode.id)){
+                 widget = registry.byId(dnode.id);
+                 myself.addChild(widget);
+                 widget.startup();
+                 return;
+              }
+              loader = new l;
               if (cls.contains(dnode, 'input-row')){
                  TFRenderRow(dnode);
               }
               else {
-                 var widget = this.createWidget(dnode);
+                 var widget = loader.createWidget(dnode);
                  if (undefined !== widget) {
-                     this.addChild(widget);
+                    widget.startup();
+                    myself.addChild(widget);
                  }
-             }
+              }
+            });
+           });
         },
         TFRenderRow: function (dnode){
            var counter = 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits