Moar widget work

Begin cleaning up widgets.js, make it smarter, faster, cleaner.
d8ahazard · Nov 27, 2018 · f0ce3e5 · f0ce3e5
1 parent 7339a6f
commit f0ce3e5
Show file tree

Hide file tree

Showing 3 changed files with 656 additions and 611 deletions.
diff --git a/js/main.js b/js/main.js
@@ -38,6 +38,8 @@ var devices = {};
 var staticCount = 0;
 var javaStrings = [];
 
+var flexWidget = 0;
+
 var grid = null;
 
 var buildingApps = false;
@@ -159,7 +161,8 @@ $(function () {
         "save": saveWidgetContainers
     };
 
-    $.flexWidget(options);
+    flexWidget = new FlexWidget(options);
+
     bgs = $('.bg');
 	logLevel = "ALL";
 
@@ -1889,6 +1892,7 @@ function setListeners() {
 		}
 
 		if ($(this).hasClass("linkBtn")) {
+			serverAddress = $("#publicAddress").val();
 			regUrl = false;
 			action = $(this).data('action');
 			serverAddress = encodeURIComponent(serverAddress);
@@ -2529,7 +2533,14 @@ function loadWidgetContainers(data) {
     for (var key in data) {
         console.log("Widget action is " + action + ": ", data[key]);
         if (data.hasOwnProperty('status')) console.log("Data Item has status here: " + data['status']);
-        if (data.hasOwnProperty(key)) $.flexWidget(action, data[key]);
+        if (data.hasOwnProperty(key)) {
+            if (firstLoad) {
+                flexWidget.addWidget(data[key]);
+            } else {
+                flexWidget.updateWidget(data[key]);
+            }
+
+        }
     }
     if (firstLoad) $('#widgetList').data('gridstack').disable();
     loadingWidgets = false;