logster 2.5.1 → 2.6.0

data/client-app/app/components/message-row.js

@@ -21,25 +21,23 @@ export default Component.extend({
       return;
     }
 
-    const $topPanel = Em.$("#top-panel");
+    const topPanel = document.getElementById("top-panel");
+    if (!topPanel) return;
 
-    const scrollTop = $topPanel.scrollTop();
-    const height = $topPanel.height();
-    const scrollHeight = $topPanel[0].scrollHeight;
-
-    STICK_TO_BOTTOM = scrollHeight - 20 < height + scrollTop;
+    const height = parseFloat(getComputedStyle(topPanel).height);
+    STICK_TO_BOTTOM = topPanel.scrollHeight - 20 < height + topPanel.scrollTop;
     CHECKED_BOTTOM = true;
   },
 
   didInsertElement() {
-    const $topPanel = Em.$("#top-panel");
-    Em.run.next(() => {
-      CHECKED_BOTTOM = false;
-
-      if (STICK_TO_BOTTOM) {
-        STICK_TO_BOTTOM = false;
-        $topPanel.scrollTop($topPanel[0].scrollHeight - $topPanel.height());
-      }
-    });
+    const topPanel = document.getElementById("top-panel");
+    if (!topPanel) return;
+
+    CHECKED_BOTTOM = false;
+    if (STICK_TO_BOTTOM) {
+      STICK_TO_BOTTOM = false;
+      topPanel.scrollTop =
+        topPanel.scrollHeight - parseFloat(getComputedStyle(topPanel).height);
+    }
   }
 });

data/client-app/app/components/panel-resizer.js

@@ -1,74 +1,92 @@
 import Component from "@ember/component";
+import { scheduleOnce, throttle } from "@ember/runloop";
+import { bound } from "client-app/lib/decorators";
+
 const MOVE_EVENTS = ["touchmove", "mousemove"];
 const UP_EVENTS = ["touchend", "mouseup"];
 const DOWN_EVENTS = ["touchstart", "mousedown"];
 
 export default Component.extend({
+  resizing: false,
   classNames: ["divider"],
 
-  divideView(fromTop, win) {
-    const $win = win || Em.$(window);
-    const height = $win.height();
-    const fromBottom = $win.height() - fromTop;
+  divideView(fromTop) {
+    const height = window.innerHeight;
+    const fromBottom = height - fromTop;
 
     if (fromTop < 100 || fromTop + 170 > height) {
       return;
     }
 
-    this.divider.css("bottom", fromBottom - 5);
+    this.divider.style.bottom = `${fromBottom - 5}px`;
     this.events.trigger("panelResized", fromBottom);
   },
 
-  didInsertElement() {
-    // inspired by http://plugins.jquery.com/misc/textarea.js
-    this.divider = Em.$(".divider");
+  @bound
+  performDrag(e) {
+    throttle(this, this.throttledPerformDrag, e, 25);
+  },
 
-    const $win = Em.$(window);
-    let resizing = false;
+  throttledPerformDrag(e) {
+    if (this.resizing) {
+      this.divideView(
+        e.clientY || (e.touches && e.touches[0] && e.touches[0].clientY)
+      );
+    }
+  },
 
-    const performDrag = e => {
-      if (resizing) {
-        this.divideView(
-          e.clientY || (e.touches && e.touches[0] && e.touches[0].clientY),
-          $win
-        );
-      }
-    };
+  @bound
+  endDrag(/* e */) {
+    const overlay = document.getElementById("overlay");
+    if (overlay) {
+      overlay.parentElement.removeChild(overlay);
+    }
+    this.set("resizing", false);
 
-    const endDrag = () => {
-      Em.$("#overlay").remove();
-      resizing = false;
+    if (localStorage) {
+      localStorage.logster_divider_bottom = parseInt(
+        this.divider.style.bottom,
+        10
+      );
+    }
 
-      if (localStorage) {
-        localStorage.logster_divider_bottom = parseInt(
-          this.divider.css("bottom"),
-          10
-        );
-      }
+    MOVE_EVENTS.forEach(name =>
+      document.removeEventListener(name, this.performDrag)
+    );
+    UP_EVENTS.forEach(name => document.removeEventListener(name, this.endDrag));
+  },
 
-      const $document = Em.$(document);
-      MOVE_EVENTS.forEach(e => $document.unbind(e, performDrag));
-      UP_EVENTS.forEach(e => $document.unbind(e, endDrag));
-    };
+  @bound
+  dividerClickHandler(e) {
+    e.preventDefault(); // for disabling pull-down-to-refresh on mobile
+    const overlay = document.createElement("DIV");
+    overlay.id = "overlay";
+    document.body.appendChild(overlay);
+    this.set("resizing", true);
+    MOVE_EVENTS.forEach(name =>
+      document.addEventListener(name, this.performDrag)
+    );
+    UP_EVENTS.forEach(name => document.addEventListener(name, this.endDrag));
+  },
 
-    this.divider.on(DOWN_EVENTS.join(" "), e => {
-      e.preventDefault(); // for disabling pull-down-to-refresh on mobile
-      Em.$("<div id='overlay'></div>").appendTo(Em.$("body"));
-      resizing = true;
-      Em.$(document)
-        .on(MOVE_EVENTS.join(" "), _.throttle(performDrag, 25))
-        .on(UP_EVENTS.join(" "), endDrag);
+  didInsertElement() {
+    // inspired by http://plugins.jquery.com/misc/textarea.js
+    this.set("divider", document.querySelector(".divider"));
+    DOWN_EVENTS.forEach(name => {
+      this.divider.addEventListener(name, this.dividerClickHandler);
     });
+    scheduleOnce("afterRender", this, "initialDivideView");
+  },
 
-    Em.run.next(() => {
-      const amount =
-        (localStorage && localStorage.logster_divider_bottom) || 300;
-      const fromTop = $win.height() - parseInt(amount, 10);
-      this.divideView(fromTop, $win);
-    });
+  initialDivideView() {
+    const amount = (localStorage && localStorage.logster_divider_bottom) || 300;
+    const fromTop = window.innerHeight - parseInt(amount, 10);
+    this.divideView(fromTop);
   },
 
   willDestroyElement() {
-    Em.$(".divider").off(DOWN_EVENTS.join(" "));
+    DOWN_EVENTS.forEach(name =>
+      this.divider.removeEventListener(name, this.dividerClickHandler)
+    );
   }
 });

data/client-app/app/components/patterns-list.js

@@ -28,7 +28,7 @@ export default Component.extend({
     return ajax(`/patterns/${this.get("key")}.json`, { method, data });
   },
 
-  alwaysBlock(pattern) {
+  finallyBlock(pattern) {
     pattern.set("saving", false);
   },
 
@@ -70,7 +70,7 @@ export default Component.extend({
             pattern.destroy();
           })
           .catch(response => this.catchBlock(pattern, response))
-          .always(() => this.alwaysBlock(pattern));
+          .finally(() => this.finallyBlock(pattern));
       }
     },
 
@@ -80,8 +80,8 @@ export default Component.extend({
       if (pattern.get("isNew")) {
         promise = this.makeAPICall({
           method: "POST",
-          pattern: pattern.get("valueBuffer"),
-          retroactive: pattern.retroactive
+          pattern: pattern.valueBuffer,
+          retroactive: !!pattern.retroactive
         }).then(response => {
           pattern.updateValue(response.pattern);
           pattern.set("isNew", false);
@@ -102,7 +102,7 @@ export default Component.extend({
         .catch(response => {
           this.catchBlock(pattern, response);
         })
-        .always(() => this.alwaysBlock(pattern));
+        .finally(() => this.finallyBlock(pattern));
     },
 
     resetCount(pattern) {
@@ -115,7 +115,7 @@ export default Component.extend({
           pattern.set("count", 0);
         })
         .catch(response => this.catchBlock(pattern, response))
-        .always(() => this.alwaysBlock(pattern));
+        .finally(() => this.finallyBlock(pattern));
     },
 
     checkboxChanged(pattern) {

data/client-app/app/components/update-time.js

@@ -1,21 +1,21 @@
 import Component from "@ember/component";
 import { formatTime } from "client-app/lib/utilities";
+import { later } from "@ember/runloop";
 
 export default Component.extend({
   didInsertElement() {
-    const updateTimes = () => {
-      Em.$(".auto-update-time").each(function() {
-        const timestamp = parseInt(this.getAttribute("data-timestamp"), 10);
-        const elem = this;
-        const text = formatTime(timestamp);
+    later(this, this.updateTimes, 60000);
+  },
 
-        if (text !== elem.innerText) {
-          elem.innerText = text;
-        }
-      });
-      Em.run.later(updateTimes, 60000);
-    };
-
-    Em.run.later(updateTimes, 60000);
+  updateTimes() {
+    Array.from(document.querySelectorAll(".auto-update-time")).forEach(node => {
+      const timestamp = parseInt(node.dataset.timestamp);
+      if (!timestamp) return;
+      const formatted = formatTime(timestamp);
+      if (formatted !== node.innerText) {
+        node.innerText = formatted;
+      }
+    });
+    later(this, this.updateTimes, 60000);
   }
 });

data/client-app/app/controllers/index.js

@@ -18,8 +18,10 @@ export default Controller.extend({
   }),
 
   resizePanels(amount) {
-    Em.$("#bottom-panel").css("height", amount - 13);
-    Em.$("#top-panel").css("bottom", amount + 12);
+    const bottomPanel = document.getElementById("bottom-panel");
+    const topPanel = document.getElementById("top-panel");
+    bottomPanel.style.height = `${amount - 13}px`;
+    topPanel.style.bottom = `${amount + 12}px`;
   },
 
   actionsInMenu: computed(function() {

data/client-app/app/index.html

@@ -6,7 +6,7 @@
     <title>ClientApp</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
-    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{&quot;env_expandable_keys&quot;:[],&quot;patterns_enabled&quot;:true}">
+    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{&quot;env_expandable_keys&quot;:[],&quot;patterns_enabled&quot;:true,&quot;gems_dir&quot;:&quot;/home/sam/.rbenv/versions/2.1.2.discourse/lib/ruby/gems/2.1.0/gems/&quot;,&quot;backtrace_links_enabled&quot;:true,&quot;gems_data&quot;:[],&quot;directories&quot;:[{&quot;path&quot;:&quot;/home/sam/Source/discourse&quot;,&quot;url&quot;:&quot;https://github.com/discourse/discourse&quot;,&quot;main_app&quot;:true}],&quot;application_version&quot;:&quot;b329e23f8511b7248c0e4aee370a9f8a249e1b84&quot;}">
 
     {{content-for "head"}}
 

data/client-app/app/initializers/app-init.js

@@ -56,7 +56,7 @@ export function initialize(app) {
   const isMobile =
     /mobile/i.test(navigator.userAgent) && !/iPad/.test(navigator.userAgent);
   if (isMobile) {
-    Em.$("body").addClass("mobile");
+    document.body.classList.add("mobile");
   }
   app.register("site:main", { isMobile }, { instantiate: false });
   app.inject("controller", "site", "site:main");

data/client-app/app/lib/decorators.js

@@ -0,0 +1,11 @@
+export function bound(target, key, desc) {
+  const orig = desc.value;
+  const boundKey = `_${key}Bound`;
+  return {
+    get() {
+      if (this[boundKey]) return this[boundKey];
+      this.set(boundKey, orig.bind(this));
+      return this[boundKey];
+    }
+  };
+}

data/client-app/app/lib/preload.js

@@ -4,9 +4,8 @@ let isInitialized = false;
 // exported so that it can be used in tests
 export function init() {
   const dataset = document.getElementById("preloaded-data").dataset;
-  CONTAINER = Em.$.extend(JSON.parse(dataset.preloaded), {
-    rootPath: dataset.rootPath
-  });
+  CONTAINER = JSON.parse(dataset.preloaded);
+  CONTAINER.rootPath = dataset.rootPath;
   isInitialized = true;
 }
 
@@ -18,3 +17,15 @@ export default {
     return Em.get(CONTAINER, key);
   }
 };
+
+// used in tests
+export function mutatePreload(key, value) {
+  if (!isInitialized) {
+    init();
+  }
+  Em.set(CONTAINER, key, value);
+}
+
+export function uninitialize() {
+  isInitialized = false;
+}

data/client-app/app/lib/utilities.js

@@ -1,4 +1,5 @@
 import Preload from "client-app/lib/preload";
+import { Promise, resolve } from "rsvp";
 
 const entityMap = {
   "&": "&",
@@ -14,16 +15,47 @@ export function escapeHtml(string) {
 }
 
 export function ajax(url, settings) {
-  settings = settings || {};
-  settings.headers = settings.headers || {};
-  settings.headers["X-SILENCE-LOGGER"] = true;
-  return Em.$.ajax(Preload.get("rootPath") + url, settings);
+  return new Promise((resolve, reject) => {
+    settings = settings || {};
+    const xhr = new XMLHttpRequest();
+    url = Preload.get("rootPath") + url;
+    if (settings.data) {
+      for (let param in settings.data) {
+        const prefix = url.indexOf("?") === -1 ? "?" : "&";
+        url += prefix;
+        url += `${param}=${encodeURIComponent(settings.data[param])}`;
+      }
+    }
+    xhr.open(settings.method || settings.type || "GET", url);
+    xhr.setRequestHeader("X-SILENCE-LOGGER", true);
+    if (settings.headers) {
+      for (let header in settings.headers) {
+        xhr.setRequestHeader(header, settings.headers[header]);
+      }
+    }
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState === 4) {
+        let status = xhr.status;
+        if ((status >= 200 && status < 300) || status === 304) {
+          const type = xhr.getResponseHeader("Content-Type");
+          let data = xhr.responseText;
+          if (/\bjson\b/.test(type)) {
+            data = JSON.parse(data);
+          }
+          resolve(data);
+        } else {
+          reject(xhr);
+        }
+      }
+    };
+    xhr.send();
+  });
 }
 
 export function preloadOrAjax(url, settings) {
   const preloaded = Preload.get(url.replace(".json", ""));
   if (preloaded) {
-    return Em.RSVP.resolve(preloaded);
+    return resolve(preloaded);
   } else {
     return ajax(url, settings);
   }
@@ -96,32 +128,33 @@ export function buildArrayString(array) {
   return "[" + buffer.join(", ") + "]";
 }
 
-export function buildHashString(hash, recurse, expanded = []) {
+export function buildHashString(hash, recurse, expanded = [], lists = {}) {
   if (!hash) return "";
 
   const buffer = [];
   const hashes = [];
   const expandableKeys = Preload.get("env_expandable_keys") || [];
-  _.each(hash, (v, k) => {
+  Object.keys(hash).forEach(k => {
+    const v = hash[k];
     if (v === null) {
       buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+    } else if (expandableKeys.indexOf(k) !== -1 && !recurse) {
       let valueHtml = "";
-      if (
-        expandableKeys.indexOf(k) !== -1 &&
-        !recurse &&
-        expanded.indexOf(k) === -1 &&
-        v.length > 3
-      ) {
-        valueHtml = `${escapeHtml(
-          v[0]
-        )}, <a class="expand-list" data-key=${k}>${v.length - 1} more</a>`;
+      if (expanded.indexOf(k) !== -1 || (lists[k] && lists[k].length < 3)) {
+        valueHtml =
+          lists[k] && lists[k].length === 1
+            ? escapeHtml(lists[k][0])
+            : buildArrayString(lists[k]);
       } else {
-        valueHtml = buildArrayString(v);
+        valueHtml = `${escapeHtml(
+          lists[k][0]
+        )}, <a class="expand-list" data-key=${k}>${lists[k].length -
+          1} more</a>`;
       }
-      buffer.push(
-        "<tr><td>" + escapeHtml(k) + "</td><td>" + valueHtml + "</td></tr>"
-      );
+      buffer.push(`<tr><td>${escapeHtml(k)}</td><td>${valueHtml}</td></tr>`);
+    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+      const valueHtml = buildArrayString(v);
+      buffer.push(`<tr><td>${escapeHtml(k)}</td><td>${valueHtml}</td></tr>`);
     } else if (typeof v === "object") {
       hashes.push(k);
     } else {
@@ -137,20 +170,14 @@ export function buildHashString(hash, recurse, expanded = []) {
     }
   });
 
-  if (_.size(hashes) > 0) {
-    _.each(hashes, function(k1) {
-      const v = hash[k1];
-      buffer.push("<tr><td></td><td><table>");
-      buffer.push(
-        "<td>" +
-          escapeHtml(k1) +
-          "</td><td>" +
-          buildHashString(v, true) +
-          "</td>"
-      );
-      buffer.push("</table></td></tr>");
-    });
-  }
+  hashes.forEach(k1 => {
+    const v = hash[k1];
+    buffer.push("<tr><td></td><td><table>");
+    buffer.push(
+      `<td>${escapeHtml(k1)}</td><td>${buildHashString(v, true)}</td>`
+    );
+    buffer.push("</table></td></tr>");
+  });
   const className = recurse ? "" : "env-table";
-  return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
+  return `<table class='${className}'>${buffer.join("\n")}</table>`;
 }