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

[<ma...@us...>]

Revision: 1415
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1415&view=rev
Author:   mayerch
Date:     2013-02-04 21:34:26 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
- Try to fix bug http://sourceforge.net/tracker/?func=detail&aid=3603250&group_id=296426&atid=1251141
- Ignore visu_config_previewtemp.xml

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/compatibility.js
    CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js

Removed Paths:
-------------
    CometVisu/trunk/visu/visu_config_previewtemp.xml

Property Changed:
----------------
    CometVisu/trunk/visu/


Property changes on: CometVisu/trunk/visu
___________________________________________________________________
Modified: svn:ignore
   - visu_config.xml

   + visu_config.xml
visu_config_previewtemp.xml


Modified: CometVisu/trunk/visu/lib/compatibility.js
===================================================================
--- CometVisu/trunk/visu/lib/compatibility.js	2013-02-04 17:23:44 UTC (rev 1414)
+++ CometVisu/trunk/visu/lib/compatibility.js	2013-02-04 21:34:26 UTC (rev 1415)
@@ -177,6 +177,13 @@
   getUrlVar: function(name){
     return $.getUrlVars()[name];
   },
+  getScriptSync: function( url ) {
+    $.ajax({
+      url: url,
+      dataType: 'script',
+      async: false
+    });
+  },
   // heavily inspired by: http://stackoverflow.com/questions/13066712/how-to-load-a-list-of-javascript-files-and-call-a-callback-after-all-of-them-are
   getOrderedScripts: function(files, callback) {
     if( 'object' === typeof files && 0 == files.length && callback )

Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js	2013-02-04 17:23:44 UTC (rev 1414)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js	2013-02-04 21:34:26 UTC (rev 1415)
@@ -162,6 +162,6 @@
 /**
  * Include the needed stuff
  */
-$.getScript( 'plugins/colorchooser/farbtastic/farbtastic.js' );
+$.getScriptSync( 'plugins/colorchooser/farbtastic/farbtastic.js' );
 $.getCSS( 'plugins/colorchooser/farbtastic/farbtastic.css' );
 

Deleted: CometVisu/trunk/visu/visu_config_previewtemp.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_previewtemp.xml	2013-02-04 17:23:44 UTC (rev 1414)
+++ CometVisu/trunk/visu/visu_config_previewtemp.xml	2013-02-04 21:34:26 UTC (rev 1415)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pages design="pure" lib_version="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./visu_config.xsd">
-  <meta>
-    <plugins>
-      <plugin name="colorchooser"/>
-      <plugin name="diagram"/>
-      <plugin name="upnpcontroller"/>
-    </plugins>
-    <mappings>
-      <mapping name="Close_Open">
-        <entry value="0">zu</entry>
-        <entry value="1">offen</entry>
-      </mapping>
-      <mapping name="Open_Close">
-        <entry value="0">offen</entry>
-        <entry value="1">zu</entry>
-      </mapping>
-      <mapping name="Off_On">
-        <entry value="0">Aus</entry>
-        <entry value="1">An</entry>
-      </mapping>
-      <mapping name="On_Off">
-        <entry value="0">An</entry>
-        <entry value="1">Aus</entry>
-      </mapping>
-      <mapping name="KonnexHVAC">
-        <entry value="auto">Auto</entry>
-        <entry value="comfort">Komfort</entry>
-        <entry value="standby">Stand By</entry>
-        <entry value="economy">Economy</entry>
-        <entry value="building_protection">Haus-Schutz</entry>
-      </mapping>
-    </mappings>
-    <stylings>
-      <styling name="Red_Green">
-        <entry value="0">red</entry>
-        <entry value="1">green</entry>
-      </styling>
-      <styling name="Green_Red">
-        <entry value="0">green</entry>
-        <entry value="1">red</entry>
-      </styling>
-      <styling name="Blue_Green_Red">
-        <entry range_min="-100" range_max="20">blue</entry>
-        <entry range_min="20" range_max="22">green</entry>
-        <entry range_min="22" range_max="100">red</entry>
-      </styling>
-    </stylings>
-    <statusbar>
-      <status type="html">&lt;img src="icon/comet_64_ff8000.png" alt="CometVisu"&gt; by &lt;a href="http://www.cometvisu.org/"&gt;CometVisu.org&lt;/a&gt;
-          - &lt;a href=".?forceReload=true"&gt;Reload&lt;/a&gt;
-          - &lt;a href="?config=demo"&gt;Widget Demo&lt;/a&gt;</status>
-      <status type="html" hrefextend="config">- &lt;a href="check_config.php"&gt;Check Config&lt;/a&gt;</status>
-    </statusbar>
-  </meta>
-  <page name="Start">
-    <line/>
-    <text align="center">
-      <label>Welcome to bla blub CometVisu!fff</label>
-    </text>
-    <line/>
-    <colorchooser>
-      <label/>
-      <address transform="bla">1/2/3</address>
-    </colorchooser>
-    <gweather width="400" height="300" city="Holzkirchen"/>
-    <urltrigger url="http://"/>
-  </page>
-</pages>

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