diff --git a/README.md b/README.md index 312d04d95..ea6fe4983 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,9 @@ Notice that these settings are valid only for reconnection and not for the first ### **WORK IN PROGRESS** --> ## Changelog +### **WORK IN PROGRESS** +* (bluefox) Corrected GUI bug + ### 1.4.13 (2022-03-22) * (pascal-hari) The group attributes will be replaced recursively diff --git a/www/js/vis.js b/www/js/vis.js index ccdd6629b..627018fb2 100644 --- a/www/js/vis.js +++ b/www/js/vis.js @@ -3224,7 +3224,7 @@ var vis = { subscribeOidAtRuntime: function (oid, callback, force) { // if state value is an oid, and it is not subscribe then subscribe it at runtime, can happen if binding are used in oid attributes // the id with invalid contains characters not allowed in oid's - if (!FORBIDDEN_CHARS.test(oid) && (this.subscribing.active.indexOf(oid) === -1 || force)) { + if (!FORBIDDEN_CHARS.test(oid) && (this.subscribing.active.indexOf(oid) === -1 || force) && oid.length < 300) { if ((/^[^.]*\.\d*\..*|^[^.]*\.[^.]*\.[^.]*\.\d*\..*/).test(oid)) { this.subscribing.active.push(oid); diff --git a/www/js/visUtils.js b/www/js/visUtils.js index a006c74fa..b6b8923d5 100644 --- a/www/js/visUtils.js +++ b/www/js/visUtils.js @@ -30,14 +30,21 @@ function replaceGroupAttr(inputStr, groupAttrList) { function getWidgetGroup(views, view, widget) { var widgets = views[view].widgets; - var members; + var groupID = widgets[widget].groupid; + if (groupID) { + return groupID; + } + for (var w in widgets) { - if (!widgets.hasOwnProperty(w)) continue; - members = views[view].widgets[w].data.members; + if (!widgets.hasOwnProperty(w) || !widgets[w].data) { + continue; + } + var members = widgets[w].data.members; if (members && members.indexOf(widget) !== -1) { return w; } } + return null; }