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

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



Revision: 6056
          http://sourceforge.net/p/ledger-smb/code/6056
Author:   einhverfr
Date:     2013-09-19 06:47:30 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Some more dojo-related bugs fixed

Modified Paths:
--------------
    trunk/UI/lib/dojo/dojo/resources/blank.html
    trunk/UI/lib/dojo/dojox/calc/_ExecutorIframe.html
    trunk/UI/lib/dojo/dojox/gfx/resources/gfxSvgProxyFrame.html
    trunk/UI/lib/dojo/dojox/io/proxy/xip_client.html
    trunk/UI/lib/dojo/dojox/io/proxy/xip_server.html
    trunk/UI/lib/elements.html
    trunk/UI/lib/setup.js

Modified: trunk/UI/lib/dojo/dojo/resources/blank.html
===================================================================
--- trunk/UI/lib/dojo/dojo/resources/blank.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/dojo/dojo/resources/blank.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -1 +1 @@
-<html><head><script>isLoaded = true;</script></head><body></body></html>
+<html><head><script>isLoaded = true;</script></head>body class="<?lsmb dojo_theme ?>"></body></html>

Modified: trunk/UI/lib/dojo/dojox/calc/_ExecutorIframe.html
===================================================================
--- trunk/UI/lib/dojo/dojox/calc/_ExecutorIframe.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/dojo/dojox/calc/_ExecutorIframe.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -526,7 +526,7 @@
 	frameElement.onload(env);
 })();
 </script>
-</head><body>
+</head>body class="<?lsmb dojo_theme ?>">
 <script type="text/javascript">
 	document.documentElement.removeChild(document.documentElement.firstChild); // remove HEAD to remove debugger access for extra security
 </script>

Modified: trunk/UI/lib/dojo/dojox/gfx/resources/gfxSvgProxyFrame.html
===================================================================
--- trunk/UI/lib/dojo/dojox/gfx/resources/gfxSvgProxyFrame.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/dojo/dojox/gfx/resources/gfxSvgProxyFrame.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -8,6 +8,6 @@
 		require(['dojox/gfx','dojox/gfx/utils'], function(gfx, utils){});
         </script>
     </head>
-    <body>
+    body class="<?lsmb dojo_theme ?>">
     </body>
 </html>

Modified: trunk/UI/lib/dojo/dojox/io/proxy/xip_client.html
===================================================================
--- trunk/UI/lib/dojo/dojox/io/proxy/xip_client.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/dojo/dojox/io/proxy/xip_client.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -93,7 +93,7 @@
 	// -->
 	<!-- </script> -->
 </head>
-<body>
+body class="<?lsmb dojo_theme ?>">
 	<h4>The Dojo Toolkit -- xip_client.html</h4>
 
 	<p>This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the "client" file used

Modified: trunk/UI/lib/dojo/dojox/io/proxy/xip_server.html
===================================================================
--- trunk/UI/lib/dojo/dojox/io/proxy/xip_server.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/dojo/dojox/io/proxy/xip_server.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -372,7 +372,7 @@
 	// -->
 	<!-- </script> -->
 </head>
-<body>
+body class="<?lsmb dojo_theme ?>">
 	<h4>The Dojo Toolkit -- xip_server.html</h4>
 
 	<p>This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the the file

Modified: trunk/UI/lib/elements.html
===================================================================
--- trunk/UI/lib/elements.html	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/elements.html	2013-09-19 06:47:30 UTC (rev 6056)
@@ -111,7 +111,10 @@
 
 <?lsmb # TEXTAREA ELEMENT ?>
 <?lsmb BLOCK textarea ?>
-  <?lsmb IF element_data  # Only process element if one exists. ?>
+  <?lsmb IF element_data;  # Only process element if one exists. 
+              IF !element_data.title.defined();
+                  element_data.title = element_data.label;
+              END; ?>
   	<?lsmb
 	    element_type = 'textarea';
 	    PROCESS auto_id;

Modified: trunk/UI/lib/setup.js
===================================================================
--- trunk/UI/lib/setup.js	2013-09-19 01:39:03 UTC (rev 6055)
+++ trunk/UI/lib/setup.js	2013-09-19 06:47:30 UTC (rev 6056)
@@ -63,13 +63,11 @@
              } 
             
          } else if (input.type == 'checkbox'){
-/*        
             return new checkbox({
                 "name": input.name,
                "value": input.value,
              "checked": input.checked
             }, input);
-*/
          } else if (input.type == 'radio'){
          }
            
@@ -105,14 +103,27 @@
          );
      
      } else if (input.nodeName == 'TEXTAREA'){
+          console.log(input);
           return new textarea(
                       { "name": input.name,
                        "value": input.innerHTML,
-                       "label": input.title }, input);
+                       "label": input.title, 
+                        "cols": input.cols,
+                        "rows": input.rows}, input);
      }
      return undefined; 
 }
 
+function try_startup(widget){
+     try{
+          return widget.startup();
+     } catch(err){
+          return false;
+     } finally {
+          //nothing
+     }
+}
+
 /* Set up form.tabular forms.  
  * Supports the following additional classes for setting columns
  * cols-1
@@ -183,26 +194,31 @@
                                     }
                                     counter = 0;
                                  }
-                             } 
-                             var widget = construct_form_node(
+                             }
+                             var widget = registry.byNode(input);
+                             if (widget == undefined){
+ 
+                                 widget = construct_form_node(
                                                query, cls, registry, textbox, checkbox, 
                                                datebox, radio, select,
                                                button, textarea, input
-                             );
+                                 );
+                             }
                              if (widget !== undefined){
                                 ++counter;
                                 if (input.nodeName == 'BUTTON'){
-                                    console.log(input);
                                     var mycp = new contentpane(
-                                        { content: "" }
-                                    );
+                                    { content: "" }
+                                );
                                  
-                                    mytabular.addChild(mycp);
-                                    mycp.addChild(widget); // obscures label
+                                mytabular.addChild(mycp);
+                                mycp.addChild(widget); // obscures label
                                      
                                 } else {
                                      mytabular.addChild(widget);
                                 } 
+                                try_startup(widget);
+            
                              }
                          }
                       ); 
@@ -222,10 +238,10 @@
                                            datebox, radio, select,
                                            button, textarea, node
                       );
-                      if (widget !== undefined){
-                          if (widget.declaredClass !== undefined){
-                              widget.startup();
-                          }
+                      if (! try_startup(widget)){
+                            console.log(widget,node);
+                      } 
+                      else {
                       }
                   });
       }

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


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits