From b7829f09f9028e64332c2f8bff3686c3c7b50c1d Mon Sep 17 00:00:00 2001 From: chylex Date: Thu, 27 Oct 2016 19:39:31 +0200 Subject: [PATCH] Set UglifyJS to mangle props and add a file with reserved props --- build.py | 2 +- reserve.txt | 31 +++++++++++++++++++++++++++++++ src/renderer/scr.state.js | 4 ++-- src/tracker/discord.js | 2 +- src/tracker/savefile.js | 8 ++++---- src/tracker/state.js | 2 +- 6 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 reserve.txt diff --git a/build.py b/build.py index 27207ec..944f64a 100644 --- a/build.py +++ b/build.py @@ -7,7 +7,7 @@ import sys import os -EXEC_UGLIFYJS = "uglifyjs --compress --mangle --screw-ie8 --output \"{1}\" \"{0}\"" +EXEC_UGLIFYJS = "uglifyjs --compress --mangle --mangle-props --reserve-domprops --reserved-file reserve.txt --screw-ie8 --output \"{1}\" \"{0}\"" EXEC_CLOSURECOMPILER = "java -jar lib/closure-compiler-v20160911.jar --js \"{0}\" --js_output_file \"{1}\"" EXEC_YUI = "java -jar lib/yuicompressor-2.4.8.jar --charset utf-8 --line-break 160 --type css -o \"{1}\" \"{0}\"" diff --git a/reserve.txt b/reserve.txt new file mode 100644 index 0000000..839e4ea --- /dev/null +++ b/reserve.txt @@ -0,0 +1,31 @@ +{ + "vars": [], + "props": [ + "autoscroll", + "_autoscroll", + "afterFirstMsg", + "_afterFirstMsg", + "afterSavedMsg", + "_afterSavedMsg", + "meta", + "data", + "users", + "userindex", + "servers", + "channels", + "name", + "type", + "server", + "u", + "t", + "m", + "f", + "e", + "a", + "id", + "user", + "msgcount", + "timestamp", + "contents" + ] +} \ No newline at end of file diff --git a/src/renderer/scr.state.js b/src/renderer/scr.state.js index b8c63e9..6e6329b 100644 --- a/src/renderer/scr.state.js +++ b/src/renderer/scr.state.js @@ -13,7 +13,7 @@ var STATE = (function(){ getChannelList: function(){ var channels = FILE.getChannels(); - return Object.keys(channels).map(key => ({ + return Object.keys(channels).map(key => ({ // reserve.txt id: key, name: channels[key].name, server: FILE.getServer(channels[key].server), @@ -44,7 +44,7 @@ var STATE = (function(){ return MSGS.slice(startIndex, !count ? undefined : startIndex+count).map(key => { var message = messages[key]; - return { + return { // reserve.txt user: FILE.getUser(message.u), timestamp: message.t, contents: message.m diff --git a/src/tracker/discord.js b/src/tracker/discord.js index faf200f..2ba07f8 100644 --- a/src/tracker/discord.js +++ b/src/tracker/discord.js @@ -39,7 +39,7 @@ var DISCORD = (function(){ var linkSplit = DOM.tag("a", channel)[0].getAttribute("href").split("/"); var name = [].find.call(DOM.cls("channel-name", channel)[0].childNodes, node => node.nodeType === Node.TEXT_NODE).nodeValue; - obj = { + obj = { // reserve.txt server: name, channel: name, id: linkSplit[linkSplit.length-1], diff --git a/src/tracker/savefile.js b/src/tracker/savefile.js index b8412a9..9509a94 100644 --- a/src/tracker/savefile.js +++ b/src/tracker/savefile.js @@ -114,7 +114,7 @@ SAVEFILE.prototype.findOrRegisterServer = function(serverName, serverType){ var index = this.meta.servers.findIndex(server => server.name === serverName && server.type === serverType); if (index === -1){ - this.meta.servers.push({ + this.meta.servers.push({ // reserve.txt name: serverName, type: serverType }); @@ -134,7 +134,7 @@ SAVEFILE.prototype.tryRegisterChannel = function(serverIndex, channelId, channel return false; } else{ - this.meta.channels[channelId] = { + this.meta.channels[channelId] = { // reserve.txt server: serverIndex, name: channelName }; @@ -151,7 +151,7 @@ SAVEFILE.prototype.addMessage = function(channelId, messageId, messageObject){ return wasUpdated; }; -SAVEFILE.prototype.convertToMessageObject = function(discordMessage){ +SAVEFILE.prototype.convertToMessageObject = function(discordMessage){ // reserve.txt var obj = { u: this.findOrRegisterUser(discordMessage.author.id, discordMessage.author.username), t: +Date.parse(discordMessage.timestamp), @@ -221,7 +221,7 @@ SAVEFILE.prototype.combineWith = function(obj){ }; SAVEFILE.prototype.toJson = function(){ - return JSON.stringify({ + return JSON.stringify({ // reserve.txt meta: this.meta, data: this.data }); diff --git a/src/tracker/state.js b/src/tracker/state.js index 93cdf6a..b10d85d 100644 --- a/src/tracker/state.js +++ b/src/tracker/state.js @@ -28,7 +28,7 @@ var STATE = (function(){ /* * Internal settings class constructor. */ - var SETTINGS = function(){ + var SETTINGS = function(){ // reserve.txt defineTriggeringProperty(this, "setting", "autoscroll"); defineTriggeringProperty(this, "setting", "afterFirstMsg"); defineTriggeringProperty(this, "setting", "afterSavedMsg");