From ac5d74d42c0824b5789cc030bf39a447951e4804 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 21 Mar 2015 21:55:02 +0100 Subject: web: fix bugs --- web/src/js/utils.js | 1 + 1 file changed, 1 insertion(+) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index bcd3958d..48f69880 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -15,6 +15,7 @@ var Key = { TAB: 9, SPACE: 32, BACKSPACE: 8, + SHIFT: 16 }; // Add A-Z for (var i = 65; i <= 90; i++) { -- cgit v1.2.3 From 39a8ac7e2a405b84edc55289cb8bdfb2ac1948fa Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 22 Mar 2015 15:19:35 +0100 Subject: web: improve views --- web/src/js/utils.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index 48f69880..be59db96 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -1,5 +1,6 @@ var $ = require("jquery"); var _ = require("lodash"); +var actions = require("./actions.js"); var Key = { UP: 38, @@ -67,13 +68,13 @@ var end = String.fromCharCode(0xffff); function reverseString(s){ return String.fromCharCode.apply(String, _.map(s.split(""), function (c) { - return 0xffff - c.charCodeAt(); + return 0xffff - c.charCodeAt(0); }) ) + end; } function getCookie(name) { - var r = document.cookie.match("\\b" + name + "=([^;]*)\\b"); + var r = document.cookie.match(new RegExp("\\b" + name + "=([^;]*)\\b")); return r ? r[1] : undefined; } var xsrf = $.param({_xsrf: getCookie("_xsrf")}); @@ -90,10 +91,12 @@ $.ajaxPrefilter(function (options) { }); // Log AJAX Errors $(document).ajaxError(function (event, jqXHR, ajaxSettings, thrownError) { + if(thrownError === "abort"){ + return; + } var message = jqXHR.responseText; - console.error(message, arguments); - EventLogActions.add_event(thrownError + ": " + message); - window.alert(message); + console.error(thrownError, message, arguments); + actions.EventLogActions.add_event(thrownError + ": " + message); }); module.exports = { -- cgit v1.2.3 From 968c7021dfef00c459899520921faf7367e923d9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 23 Mar 2015 00:24:56 +0100 Subject: web: add basic edit capability for first line --- web/src/js/utils.js | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index be59db96..6fc11f9e 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -2,6 +2,10 @@ var $ = require("jquery"); var _ = require("lodash"); var actions = require("./actions.js"); +//debug +window.$ = $; +window._ = _; + var Key = { UP: 38, DOWN: 40, @@ -28,17 +32,17 @@ var formatSize = function (bytes) { if (bytes === 0) return "0"; var prefix = ["b", "kb", "mb", "gb", "tb"]; - for (var i = 0; i < prefix.length; i++){ - if (Math.pow(1024, i + 1) > bytes){ + for (var i = 0; i < prefix.length; i++) { + if (Math.pow(1024, i + 1) > bytes) { break; } } var precision; - if (bytes%Math.pow(1024, i) === 0) + if (bytes % Math.pow(1024, i) === 0) precision = 0; else precision = 1; - return (bytes/Math.pow(1024, i)).toFixed(precision) + prefix[i]; + return (bytes / Math.pow(1024, i)).toFixed(precision) + prefix[i]; }; @@ -60,17 +64,16 @@ var formatTimeStamp = function (seconds) { return ts.replace("T", " ").replace("Z", ""); }; - // At some places, we need to sort strings alphabetically descending, // but we can only provide a key function. // This beauty "reverses" a JS string. var end = String.fromCharCode(0xffff); -function reverseString(s){ +function reverseString(s) { return String.fromCharCode.apply(String, - _.map(s.split(""), function (c) { - return 0xffff - c.charCodeAt(0); - }) - ) + end; + _.map(s.split(""), function (c) { + return 0xffff - c.charCodeAt(0); + }) + ) + end; } function getCookie(name) { @@ -82,21 +85,22 @@ var xsrf = $.param({_xsrf: getCookie("_xsrf")}); //Tornado XSRF Protection. $.ajaxPrefilter(function (options) { if (["post", "put", "delete"].indexOf(options.type.toLowerCase()) >= 0 && options.url[0] === "/") { - if (options.data) { - options.data += ("&" + xsrf); + if(options.url.indexOf("?") === -1){ + options.url += "?" + xsrf; } else { - options.data = xsrf; + options.url += "&" + xsrf; } } }); // Log AJAX Errors $(document).ajaxError(function (event, jqXHR, ajaxSettings, thrownError) { - if(thrownError === "abort"){ + if (thrownError === "abort") { return; } var message = jqXHR.responseText; console.error(thrownError, message, arguments); actions.EventLogActions.add_event(thrownError + ": " + message); + alert(message); }); module.exports = { @@ -104,5 +108,5 @@ module.exports = { formatTimeDelta: formatTimeDelta, formatTimeStamp: formatTimeStamp, reverseString: reverseString, - Key: Key + Key: Key, }; \ No newline at end of file -- cgit v1.2.3 From fd911b75e6a59c1050815a6c183c4eb32aaabb98 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 29 Mar 2015 01:45:37 +0100 Subject: web: global key handling --- web/src/js/utils.js | 1 + 1 file changed, 1 insertion(+) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index 6fc11f9e..7aaf213f 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -5,6 +5,7 @@ var actions = require("./actions.js"); //debug window.$ = $; window._ = _; +window.React = require("React/addons"); var Key = { UP: 38, -- cgit v1.2.3 From 93d1d0416d6b48506e4579456ad3d7cd9dbd3e91 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 29 Mar 2015 03:24:03 +0200 Subject: web: add more keyboard shortcuts --- web/src/js/utils.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index 7aaf213f..d848ff24 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -2,10 +2,10 @@ var $ = require("jquery"); var _ = require("lodash"); var actions = require("./actions.js"); -//debug -window.$ = $; -window._ = _; -window.React = require("React/addons"); +//Debug (don't expose by default, this increases compile time drastically) +//window.$ = $; +//window._ = _; +//window.React = require("React"); var Key = { UP: 38, -- cgit v1.2.3 From 6d29f93e9eaaabe20c0d46887048f2367bfbb3cf Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 30 Mar 2015 03:49:50 +0200 Subject: web: add prompt for keyboard navigation --- web/src/js/utils.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index d848ff24..40575692 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -2,10 +2,9 @@ var $ = require("jquery"); var _ = require("lodash"); var actions = require("./actions.js"); -//Debug (don't expose by default, this increases compile time drastically) -//window.$ = $; -//window._ = _; -//window.React = require("React"); +window.$ = $; +window._ = _; +window.React = require("react"); var Key = { UP: 38, -- cgit v1.2.3