flowchart js betoltes bizonytalansag

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33174

diff --git a/server/user.mediacube.gui/js/processVisualizer.js b/server/user.mediacube.gui/js/processVisualizer.js
index 835bab855adf8b2bb0c6ff2bc35cac9cb38cee9e..7a2472b6c4c743b57a01ca00b60c36f76c75f5cf 100644 (file)
--- a/server/user.mediacube.gui/js/processVisualizer.js
+++ b/server/user.mediacube.gui/js/processVisualizer.js
@@ -57,7 +57,7 @@ var defaultFlowchartData = {
                                        }\r
                                }\r
                        }\r
-               },\r
+               }\r
        }\r
 };\r
 \r
@@ -65,9 +65,9 @@ var flowChartWidget = null;
 \r
 $(document).ready(function() {\r
        var $flowchart = $('#flowchartworkspace');\r
+       console.log($flowchart.flowchart)\r
 \r
-       // Apply the plugin on a standard, empty div...\r
-       flowChartWidget = $flowchart.flowchart({                \r
+       flowChartWidget = $flowchart.flowchart({\r
                data: defaultFlowchartData,\r
                defaultSelectedLinkColor: '#000055',\r
                grid: 10,\r

diff --git a/server/user.mediacube.gui/pages/processVisualizer.zul b/server/user.mediacube.gui/pages/processVisualizer.zul
index 19977f28e7e1b92e98837a6f83835c8f354c5e92..e117404f7b9c90f136bf6b2cee6f0dee36acf410 100644 (file)
--- a/server/user.mediacube.gui/pages/processVisualizer.zul
+++ b/server/user.mediacube.gui/pages/processVisualizer.zul
@@ -1,15 +1,13 @@
-<!DOCTYPE xml>\r
-\r
 <zk xmlns:h="xhtml">   \r
        <style src="/css/jquery.flowchart.css" />\r
-       <h:script src="/js/jquery-ui.js" />\r
-       <h:script src="/js/jquery.flowchart.js" />\r
-       <script src="/js/processVisualizer.js?v=16" />\r
+       <script src="/js/jquery-ui.js?v=17" />\r
+       <script src="/js/jquery.flowchart.js?v=17" />\r
+       <h:script src="/js/processVisualizer.js?v=18" />\r
        <div viewModel="@id('jlm') @init('user.jobengine.zk.model.JobFlowChartModel')">\r
                <h:div id="chart_container">\r
                        <h:div class="flowchart-example-container" id="flowchartworkspace" />\r
                </h:div>\r
-                               <button id="loadChartButton" label="Load chart" onClick="@command('loadChart')" />\r
+               <button id="loadChartButton" label="Load chart" onClick="@command('loadChart')" />\r
                \r
        </div>\r
 </zk>\r