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

[..hidden..]

Revision: 5935
          http://sourceforge.net/p/ledger-smb/code/5935
Author:   freelock
Date:     2013-08-04 15:35:14 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Enhancements #15: Replace include_dojo with dojo_require (array of
widgets and parsing support); and #14: add support for dojo_load, make
string instead of array, call object's init() method

Modified Paths:
--------------
    trunk/UI/Contact/contact.html
    trunk/UI/journal/journal_entry.html
    trunk/UI/lib/ui-header.html

Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html	2013-08-03 16:11:36 UTC (rev 5934)
+++ trunk/UI/Contact/contact.html	2013-08-04 15:35:14 UTC (rev 5935)
@@ -6,9 +6,7 @@
 	        'UI/lib/dojo/dojo/resources/dojo.css',
 		'UI/Contact/contact.css'
 	] 
-	include_dojo = [
-		'lsmb/Contact/tabs'
-	]
+	dojo_load = 'lsmb/Contact/tabs'
 ?>
 <?lsmb PROCESS 'elements.html';
 PROCESS "dynatable.html"  ?>

Modified: trunk/UI/journal/journal_entry.html
===================================================================
--- trunk/UI/journal/journal_entry.html	2013-08-03 16:11:36 UTC (rev 5934)
+++ trunk/UI/journal/journal_entry.html	2013-08-04 15:35:14 UTC (rev 5935)
@@ -1,6 +1,7 @@
 <?lsmb INCLUDE 'ui-header.html' 
-        include_dojo = [
-	  'lsmb/accounts/init'
+        dojo_require = [
+	  'lsmb/accounts/AccountSelector',
+	  'dijit/form/DateTextBox'
 	  ]
 	include_stylesheet = [
 		'UI/lib/dojo/dijit/themes/claro/claro.css',

Modified: trunk/UI/lib/ui-header.html
===================================================================
--- trunk/UI/lib/ui-header.html	2013-08-03 16:11:36 UTC (rev 5934)
+++ trunk/UI/lib/ui-header.html	2013-08-04 15:35:14 UTC (rev 5935)
@@ -22,7 +22,7 @@
 	<?lsmb FOREACH s = include_script ?>
 	<script type="text/javascript" language="JavaScript" src="<?lsmb s ?>" ></script>
 	<?lsmb END ?>
-	<?lsmb IF include_dojo ?>
+	<?lsmb IF dojo_require || dojo_load ?>
 	<script type="text/javascript">    
 	  var dojoConfig = {
 	       async: 1,
@@ -30,15 +30,28 @@
 	       packages: [{"name":"lsmb","location":"../../.."}]
 	   }
        </script>
-       <script type="text/javascript" language="JavaScript" src="UI/lib/dojo/dojo/dojo.js"></script>
-        <?lsmb FOREACH s = include_dojo ?>
+       <script type="text/javascript" language="JavaScript" src="UI/lib/dojo/dojo/dojo.js.uncompressed.js"></script>
        <script type="text/javascript">
-	require(['<?lsmb s ?>','dojo/ready'], function(obj){
+	       require([
+	          <?lsmb IF dojo_load ?>
+	          '<?lsmb dojo_load ?>',
+		  <?lsmb END ?>
+		  'dojo/parser',
+ 		  <?lsmb FOREACH s = dojo_require ?>
+		  '<?lsmb s ?>',
+                  <?lsmb END ?>
+		  'dojo/ready'], function(
+	          <?lsmb IF dojo_load ?>
+		  obj,
+		  <?lsmb END ?>
+		  parser){
+			parser.parse();
+	          <?lsmb IF dojo_load ?>
 			obj.init();
+		  <?lsmb END ?>
 			});
         </script>
 	<?lsmb END ?>
-	<?lsmb END ?>
 	
 	<?lsmb IF warn_expire ?>
 	<script type="text/javascript" language="JavaScript">

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