Skip to content

Commit

Permalink
* (bluefox) Corrected GUI bug
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Mar 31, 2022
1 parent e835c41 commit c5ddda8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion www/js/vis.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
13 changes: 10 additions & 3 deletions www/js/visUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit c5ddda8

Please sign in to comment.