[Openautomation-svn] SF.net SVN: openautomation:[190] CometVisu/trunk/visu

[<net...@us...>]

Revision: 190
          http://openautomation.svn.sourceforge.net/openautomation/?rev=190&view=rev
Author:   netzkind
Date:     2010-12-10 20:44:49 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
- removed "unknown" from type-list in editor
- changed inclusion of plugins at runtime so they can be debugged with firebug et al.

Modified Paths:
--------------
    CometVisu/trunk/visu/edit/visuconfig_edit.js
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js	2010-12-09 22:27:13 UTC (rev 189)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js	2010-12-10 20:44:49 UTC (rev 190)
@@ -100,6 +100,10 @@
         var options = {};
         $("#addMaster").find("select#add_type").empty();
         jQuery.each(design.creators, function (index, e) {
+            if (index == "unknown") {
+                // "unknown" is not a good choice for a new widget :)
+                return;
+            }
             $("#addMaster").find("select#add_type").append(
                 $("<option />").attr("value", index).html(index)
             );

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2010-12-09 22:27:13 UTC (rev 189)
+++ CometVisu/trunk/visu/lib/templateengine.js	2010-12-10 20:44:49 UTC (rev 190)
@@ -101,7 +101,7 @@
 $(document).ready(function() {
   // get the data once the page was loaded
   $.ajaxSetup({cache: false});
-  window.setTimeout("$.get( 'visu_config" + configSuffix + ".xml', setup_page );", 200);
+  window.setTimeout("$.get( 'visu_config" + configSuffix + ".xml', parseXML );", 200);
 
   // disable text selection - it's annoying on a touch screen!
   if($.browser.mozilla)
@@ -161,8 +161,7 @@
 }
 $( window ).bind( 'resize', handleResize );
 
-function setup_page( xml )
-{
+function parseXML(xml) {
   // erst mal den Cache für AJAX-Requests wieder aktivieren
   $.ajaxSetup({cache: true});
 
@@ -171,9 +170,33 @@
   $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/' + design + '/mobile.css" media="only screen and (max-device-width: 480px)" />' );
 
   // start with the plugins
+  var pluginsToLoad = 0;
   $( 'meta > plugins plugin', xml ).each( function(i){
+      pluginsToLoad += 1;
     var name = $(this).attr('name');
-    $( 'head' ).append( '<script src="plugins/' + name + '/structure_plugin.js" type="text/javascript"></script>' );
+    var html_doc = document.getElementsByTagName('body')[0];
+    js = document.createElement('script');
+    js.setAttribute('type', 'text/javascript');
+    js.setAttribute('src', 'plugins/' + name + '/structure_plugin.js');
+    html_doc.appendChild(js);
+
+    js.onreadystatechange = function () {
+        if (js.readyState == 'complete') {
+            pluginsToLoad -= 1;
+            if (pluginsToLoad <= 0) {
+                setup_page(xml);
+            }
+        }
+    }
+
+    js.onload = function () {
+        pluginsToLoad -= 1;
+        if (pluginsToLoad <= 0) {
+            setup_page(xml);
+        }
+    }
+    return false;
+
   } );
 
   // then the mappings
@@ -224,10 +247,19 @@
   // adapt width for pages to show
   handleResize();
 
+    if (pluginsToLoad <= 0) {
+        setup_page(xml);
+    }
+
+
+}
+
+function setup_page( xml )
+{
   // and now setup the pages
   var page = $( 'pages > page', xml )[0]; // only one page element allowed...
 
-  create_pages( page, '0' );
+  create_pages(page, '0');
 
   // setup the scrollable
   main_scroll = $('#main').scrollable({keyboard: false, touch: false}).data('scrollable');


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