From 5ec0340f1cf83656e60d01c66601257e2439e7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 23 Jul 2017 15:43:05 -0700 Subject: [PATCH] Strict mode for js files, fix minor typos --- assets/static/alerts.js | 3 ++- assets/static/autocomplete.js | 2 ++ assets/static/colors.js | 2 ++ assets/static/config.js | 2 ++ assets/static/counter.js | 2 ++ assets/static/filters.js | 5 ++++- assets/static/grid.js | 6 +++++- assets/static/option.js | 3 +++ assets/static/progress.js | 2 ++ assets/static/querystring.js | 2 ++ assets/static/sentry.js | 2 ++ assets/static/silence.js | 2 ++ assets/static/summary.js | 2 ++ assets/static/templates.js | 9 +++++++++ assets/static/ui.js | 2 ++ assets/static/unsee.js | 17 ++++++++++++++--- assets/static/unsilence.js | 1 + assets/static/watchdog.js | 2 ++ 18 files changed, 60 insertions(+), 6 deletions(-) diff --git a/assets/static/alerts.js b/assets/static/alerts.js index 273ec429e..560b092f7 100644 --- a/assets/static/alerts.js +++ b/assets/static/alerts.js @@ -1,3 +1,4 @@ +"use strict"; const LRUMap = require("lru"); const moment = require("moment"); @@ -20,7 +21,7 @@ function AlertGroup(groupData) { } AlertGroup.prototype.Render = function() { - return templates.render("alertGroup", { + return templates.renderTemplate("alertGroup", { group: this, alertLimit: 5 }); diff --git a/assets/static/autocomplete.js b/assets/static/autocomplete.js index 89d8cf22c..36fdabddb 100644 --- a/assets/static/autocomplete.js +++ b/assets/static/autocomplete.js @@ -1,3 +1,5 @@ +"use strict"; + const Bloodhound = require("corejs-typeahead/dist/bloodhound"); const $ = require("jquery"); diff --git a/assets/static/colors.js b/assets/static/colors.js index 2a11ef33f..beba85c30 100644 --- a/assets/static/colors.js +++ b/assets/static/colors.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); var colors = {}, diff --git a/assets/static/config.js b/assets/static/config.js index 17b8d906f..dc2794e4d 100644 --- a/assets/static/config.js +++ b/assets/static/config.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); const Cookies = require("js-cookie"); const Clipboard = require("clipboard"); diff --git a/assets/static/counter.js b/assets/static/counter.js index 3ea280075..3fff45d12 100644 --- a/assets/static/counter.js +++ b/assets/static/counter.js @@ -1,3 +1,5 @@ +"use strict"; + const Favico = require("favico.js"); const $ = require("jquery"); diff --git a/assets/static/filters.js b/assets/static/filters.js index 370b1cb8e..6d621ca30 100644 --- a/assets/static/filters.js +++ b/assets/static/filters.js @@ -1,7 +1,10 @@ -const $ = require("jquery"); +"use strict"; + +const $ = window.$ = window.jQuery = require("jquery"); const sha1 = require("js-sha1"); const Cookies = require("js-cookie"); require("bootstrap-tagsinput"); +require("corejs-typeahead"); const autocomplete = require("./autocomplete"); const unsee = require("./unsee"); diff --git a/assets/static/grid.js b/assets/static/grid.js index b85cc144a..748b59dd1 100644 --- a/assets/static/grid.js +++ b/assets/static/grid.js @@ -1,4 +1,7 @@ +"use strict"; + const Masonry = require("masonry-layout"); +const jQueryBridget = require("jquery-bridget"); const $ = require("jquery"); const config = require("./config"); @@ -12,7 +15,8 @@ var selectors = { var grid; function init() { - grid = Masonry($(selectors.alerts), { + jQueryBridget( "masonry", Masonry, $ ); + grid = $(selectors.alerts).masonry({ itemSelector: selectors.incident, columnWidth: selectors.gridSizer, percentPosition: true, diff --git a/assets/static/option.js b/assets/static/option.js index cf5d4101e..ddad7599d 100644 --- a/assets/static/option.js +++ b/assets/static/option.js @@ -1,4 +1,7 @@ +"use strict"; + const $ = require("jquery"); +require("bootstrap-switch"); const Cookies = require("js-cookie"); const querystring = require("./querystring"); diff --git a/assets/static/progress.js b/assets/static/progress.js index 9f9d3eb84..122d6ca73 100644 --- a/assets/static/progress.js +++ b/assets/static/progress.js @@ -1,3 +1,5 @@ +"use strict"; + const NProgress = require("nprogress"); const unsee = require("./unsee"); diff --git a/assets/static/querystring.js b/assets/static/querystring.js index cc330604e..a919a16bb 100644 --- a/assets/static/querystring.js +++ b/assets/static/querystring.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); function parse() { diff --git a/assets/static/sentry.js b/assets/static/sentry.js index bade3f476..573165f73 100644 --- a/assets/static/sentry.js +++ b/assets/static/sentry.js @@ -1,3 +1,5 @@ +"use strict"; + const Raven = require("raven-js"); const $ = require("jquery"); diff --git a/assets/static/silence.js b/assets/static/silence.js index 3c465db77..73ccb8366 100644 --- a/assets/static/silence.js +++ b/assets/static/silence.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); const moment = require("moment"); diff --git a/assets/static/summary.js b/assets/static/summary.js index 6497a24aa..8f3b5f75a 100644 --- a/assets/static/summary.js +++ b/assets/static/summary.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); const colors = require("./colors"); diff --git a/assets/static/templates.js b/assets/static/templates.js index 141dea7e8..975654cac 100644 --- a/assets/static/templates.js +++ b/assets/static/templates.js @@ -1,5 +1,10 @@ +"use strict"; + const $ = require("jquery"); const _ = require("underscore"); +const moment = require("moment"); + +const alerts = require("./alerts"); var templates = {}, config = { @@ -59,6 +64,10 @@ function init() { } function renderTemplate(name, context) { + context["moment"] = moment; + context["renderTemplate"] = renderTemplate; + context["sortMapByKey"] = alerts.sortMapByKey; + context["getLabelAttrs"] = alerts.getLabelAttrs; var t = templates[name]; if (t === undefined) { console.error("Unknown template " + name); diff --git a/assets/static/ui.js b/assets/static/ui.js index c7a811c6b..0e7f16eb1 100644 --- a/assets/static/ui.js +++ b/assets/static/ui.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); const alerts = require("./alerts"); diff --git a/assets/static/unsee.js b/assets/static/unsee.js index 476874033..e71410300 100644 --- a/assets/static/unsee.js +++ b/assets/static/unsee.js @@ -1,7 +1,18 @@ -const $ = require("jquery"); +"use strict"; + +const $ = window.$ = window.jQuery = require("jquery"); const moment = require("moment"); const Raven = require("raven-js"); +require("bootstrap-loader"); +require("font-awesome-webpack"); + +require("bootstrap-select"); +require("bootstrap-select/less/bootstrap-select.less") + +require("./managed/js/4.17.47-bootstrap-datetimepicker.min.js"); +require("./managed/js/0.1.2-loaders.css.min.js"); + const alerts = require("./alerts"); const autocomplete = require("./autocomplete"); const colors = require("./colors"); @@ -186,7 +197,7 @@ function triggerReload() { summary.update({}); filters.reloadBadges(resp.filters); colors.update(resp.colors); - alerts.update(resp); + alerts.updateAlerts(resp); updateCompleted(); watchdog.pong(moment(resp.timestamp)); resume(); @@ -336,7 +347,7 @@ $(document).ready(function() { colors.init($("#alerts").data("static-color-labels").split(" ")); templates.init(); ui.init(); - silence.init(); + silence.setupSilenceForm(); unsilence.init(); init(); diff --git a/assets/static/unsilence.js b/assets/static/unsilence.js index dab039d9b..f11d6d671 100644 --- a/assets/static/unsilence.js +++ b/assets/static/unsilence.js @@ -1,3 +1,4 @@ +"use strict"; const $ = require("jquery"); diff --git a/assets/static/watchdog.js b/assets/static/watchdog.js index abb3ea299..1d35dead0 100644 --- a/assets/static/watchdog.js +++ b/assets/static/watchdog.js @@ -1,3 +1,5 @@ +"use strict"; + const $ = require("jquery"); const moment = require("moment");