@ntlab/sipd-tu-bridge-ui 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntlab/sipd-tu-bridge-ui",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "SIPD Penatausahaan Bridge Web Interface",
   "main": "index.js",
   "scripts": {

package/views/ui/activity.ejs

@@ -10,19 +10,15 @@ $.activity = {
         const self = this;
         $.get(self.url)
             .done(function(json) {
-                if (json.logs) {
-                    self.el.text(json.logs);
+                if (json.logs && $.addLog(self.el, json.logs)) {
                     self.time = json.time;
                 }
             });
     },
     add(data) {
         const self = this;
-        if (data.time >= self.time) {
-            const message = data.message + '\\r\\n';
-            if (self.el.text().substr(-message.length) !== message) {
-                self.el.append(message);
-                self.el.scrollTop(self.el[0].scrollHeight - self.el.height());
+        if (self.time === undefined || data.time >= self.time) {
+            if ($.addLog(self.el, data.message)) {
                 self.time = data.time;
             }
         }

package/views/ui/bridgehandler.ejs

@@ -4,23 +4,22 @@ $.bridge = {
     bridges: {},
     getLog(name) {
         const self = this;
-        $.get('${route('Ui', {name: 'log', bridge: 'BRIDGE'})}'.replace(/BRIDGE/, name))
-            .done(function(json) {
-                if (json.logs) {
-                    const log = $(self.bridges[name].log);
-                    log.text(json.logs);
-                    self.bridges[name].time = json.time;
-                }
-            });
+        if (self.bridges[name]) {
+            $.get('${route('Ui', {name: 'log', bridge: 'BRIDGE'})}'.replace(/BRIDGE/, name))
+                .done(function(json) {
+                    if (json.logs && $.addLog(self.bridges[name].log, json.logs)) {
+                        self.bridges[name].time = json.time;
+                    }
+                });
+        }
     },
     addLog(name, data) {
         const self = this;
-        if (data.time >= self.bridges[name].time) {
-            const log = $(self.bridges[name].log);
-            const message = data.message + '\\r\\n';
-            if (log.text().substr(-message.length) !== message) {
-                log.append(message);
-                log.scrollTop(log[0].scrollHeight - log.height());
+        if (
+            self.bridges[name] &&
+            (self.bridges[name].time === undefined || data.time >= self.bridges[name].time)
+        ) {
+            if ($.addLog(self.bridges[name].log, data.message)) {
                 self.bridges[name].time = data.time;
             }
         }

package/views/ui/util.ejs

@@ -29,6 +29,15 @@ $.uiRefresh = function() {
             }
         });
 }
+$.addLog(el, message) {
+    message += '\\r\\n';
+    if (el.text().substr(-message.length) !== message) {
+        el.append(document.createTextNode(message));
+        el.scrollTop(el[0].scrollHeight - el.height());
+        return true;
+    }
+    return false;
+}
 $.hidePayload = function(message) {
     if (message) {
         message = message.replace(