diff --git a/src/Console/Log.es6 b/src/Console/Log.es6 index 7c02682..945f594 100644 --- a/src/Console/Log.es6 +++ b/src/Console/Log.es6 @@ -177,7 +177,7 @@ Log.showGetterVal = false; Log.showUnenumerable = true; Log.showSrcInSources = false; -var getAbstract = util.wrap(origGetAbstract, function (fn, obj) +let getAbstract = util.wrap(origGetAbstract, function (fn, obj) { return fn(obj, { getterVal: Log.showGetterVal, @@ -237,18 +237,18 @@ function formatTable(args) return ret; } -var regJsUrl = /https?:\/\/([0-9.\-A-Za-z]+)(?::(\d+))?\/[A-Z.a-z0-9/]*\.js/g, +let regJsUrl = /https?:\/\/([0-9.\-A-Za-z]+)(?::(\d+))?\/[A-Z.a-z0-9/]*\.js/g, regErudaJs = /eruda(\.min)?\.js/; function formatErr(err) { - var lines = err.stack ? err.stack.split('\n') : [], + let lines = err.stack ? err.stack.split('\n') : [], msg = `${err.message || lines[0]}
`; lines = lines.filter(val => !regErudaJs.test(val)) .map(val => util.escape(val)); - var stack = `
${lines.slice(1).join('
')}
`; + let stack = `
${lines.slice(1).join('
')}
`; return msg + stack.replace(regJsUrl, match => `${match}`); } @@ -293,7 +293,7 @@ function formatMsg(args, {htmlForEl = true} = {}) return args.join(' ') + '
'; } -var formatDir = args => formatMsg(args, {htmlForEl: false}); +let formatDir = args => formatMsg(args, {htmlForEl: false}); function substituteStr(args) { @@ -375,9 +375,9 @@ function formatEl(val) return `
${highlight(beautify.html(val.outerHTML), 'html')}
`; } -var regUrl = /(^|[\s\n]|<[A-Za-z]*\/?>)((?:https?|ftp):\/\/[-A-Z0-9+\u0026\u2019@#/%?=()~_|!:,.;]*[-A-Z0-9+\u0026@#/%=~()_|])/gi; +let regUrl = /(^|[\s\n]|<[A-Za-z]*\/?>)((?:https?|ftp):\/\/[-A-Z0-9+\u0026\u2019@#/%?=()~_|!:,.;]*[-A-Z0-9+\u0026@#/%=~()_|])/gi; -var recognizeUrl = str => str.replace(regUrl, '$2'); +let recognizeUrl = str => str.replace(regUrl, '$2'); function getFrom() { @@ -398,10 +398,10 @@ function getFrom() return ret; } -var getCurTime = () => util.dateFormat('HH:MM:ss'); +let getCurTime = () => util.dateFormat('HH:MM:ss'); -var tpl = require('./Log.hbs'); -var render = data => tpl(data); +let tpl = require('./Log.hbs'); +let render = data => tpl(data); function extractObj(obj, options = {}) { diff --git a/src/Console/Logger.es6 b/src/Console/Logger.es6 index f0d4849..1e8221b 100644 --- a/src/Console/Logger.es6 +++ b/src/Console/Logger.es6 @@ -26,7 +26,7 @@ export default class Logger extends util.Emitter } maxNum(val) { - var logs = this._logs; + let logs = this._logs; this._maxNum = val; if (util.isNum(val) && logs.length > val) @@ -106,7 +106,7 @@ export default class Logger extends util.Emitter } timeEnd(name) { - var startTime = this._timer[name]; + let startTime = this._timer[name]; if (!startTime) return; delete this._timer[name]; @@ -243,13 +243,13 @@ export default class Logger extends util.Emitter } scrollToBottom() { - var el = this._$el.get(0); + let el = this._$el.get(0); el.scrollTop = el.scrollHeight; } _filterLogs(logs) { - var filter = this._filter; + let filter = this._filter; if (filter === 'all') return logs; @@ -300,7 +300,7 @@ export default class Logger extends util.Emitter } _bindEvent() { - var self = this; + let self = this; this._$el.on('click', '.eruda-log-item', function () { @@ -329,13 +329,13 @@ export default class Logger extends util.Emitter } } -var cmdList = require('./cmdList.json'), +let cmdList = require('./cmdList.json'), helpMsg = require('./help.hbs')({commands: cmdList}), libraries = require('./libraries.json'); -var evalJs = jsInput => +let evalJs = jsInput => { - var ret; + let ret; try { ret = eval.call(window, `(${jsInput})`); diff --git a/src/DevTools/DevTools.es6 b/src/DevTools/DevTools.es6 index 89cbc60..3ced3ea 100644 --- a/src/DevTools/DevTools.es6 +++ b/src/DevTools/DevTools.es6 @@ -64,7 +64,7 @@ export default class DevTools extends util.Emitter } get(name) { - var tool = this._tools[name]; + let tool = this._tools[name]; if (tool) return tool; } @@ -73,12 +73,12 @@ export default class DevTools extends util.Emitter if (this._curTool === name) return this; this._curTool = name; - var tools = this._tools; + let tools = this._tools; - var tool = tools[name]; + let tool = tools[name]; if (!tool) return; - var lastTool = {}; + let lastTool = {}; util.each(tools, (tool) => { @@ -101,7 +101,7 @@ export default class DevTools extends util.Emitter } _initCfg() { - var cfg = this.config = util.createCfg('dev-tools'); + let cfg = this.config = util.createCfg('dev-tools'); cfg.set(util.defaults(cfg.get(), { transparency: '95%', @@ -142,7 +142,7 @@ export default class DevTools extends util.Emitter } _appendTpl() { - var $parent = this.$parent; + let $parent = this.$parent; $parent.append(require('./DevTools.hbs')()); @@ -156,7 +156,7 @@ export default class DevTools extends util.Emitter } } -var localStore = util.safeStorage('local'); +let localStore = util.safeStorage('local'); -var activeEruda = flag => localStore.setItem('active-eruda', flag); +let activeEruda = flag => localStore.setItem('active-eruda', flag); diff --git a/src/Elements/CssStore.es6 b/src/Elements/CssStore.es6 index 57ef45b..9ab1971 100644 --- a/src/Elements/CssStore.es6 +++ b/src/Elements/CssStore.es6 @@ -2,11 +2,11 @@ import util from '../lib/util' function formatStyle(style) { - var ret = {}; + let ret = {}; for (let i = 0, len = style.length; i < len; i++) { - var name = style[i]; + let name = style[i]; if (style[name] === 'initial') continue; @@ -16,9 +16,9 @@ function formatStyle(style) return ret; } -var elProto = Element.prototype; +let elProto = Element.prototype; -var matchesSel = function () { return false }; +let matchesSel = function () { return false }; if (elProto.webkitMatchesSelector) { @@ -36,13 +36,13 @@ export default class CssStore } getComputedStyle() { - var computedStyle = window.getComputedStyle(this._el); + let computedStyle = window.getComputedStyle(this._el); return formatStyle(computedStyle); } getMatchedCSSRules() { - var ret = []; + let ret = []; util.each(document.styleSheets, (styleSheet) => { @@ -50,7 +50,7 @@ export default class CssStore util.each(styleSheet.cssRules, (cssRule) => { - var matchesEl = false; + let matchesEl = false; // Mobile safari will throw DOM Exception 12 error, need to try catch it. try { @@ -73,4 +73,4 @@ export default class CssStore { return matchesSel(this._el, selText); } -} \ No newline at end of file +} diff --git a/src/Elements/Elements.es6 b/src/Elements/Elements.es6 index 28b8bdb..0b0d3d9 100644 --- a/src/Elements/Elements.es6 +++ b/src/Elements/Elements.es6 @@ -80,7 +80,7 @@ export default class Elements extends Tool { if (this._curEl === this._htmlEl) return; - var parentQueue = this._curParentQueue, + let parentQueue = this._curParentQueue, parent = parentQueue.shift(); while (!isElExist(parent)) parent = parentQueue.shift(); @@ -95,7 +95,7 @@ export default class Elements extends Tool this._$el.on('click', '.eruda-child', function () { - var idx = util.$(this).data('idx'), + let idx = util.$(this).data('idx'), curEl = self._curEl, el = curEl.childNodes[idx]; @@ -382,7 +382,7 @@ function formatElName(data, {noAttr = false} = {}) { util.each(attributes, (attr) => { - var name = attr.name; + let name = attr.name; if (name === 'id' || name === 'class' || name === 'style') return; ret += ` ${name}="${attr.value}"`; }); @@ -391,7 +391,7 @@ function formatElName(data, {noAttr = false} = {}) return ret; } -var formatAttr = attributes => util.map(attributes, attr => +let formatAttr = attributes => util.map(attributes, attr => { let {name, value} = attr; value = util.escape(value); @@ -409,12 +409,12 @@ function formatChildNodes(nodes) for (let i = 0, len = nodes.length; i < len; i++) { - var child = nodes[i], + let child = nodes[i], nodeType = child.nodeType; if (nodeType === 3 || nodeType === 8) { - var val = child.nodeValue.trim(); + let val = child.nodeValue.trim(); if (val !== '') ret.push({ text: val, isCmt: nodeType === 8, @@ -423,7 +423,7 @@ function formatChildNodes(nodes) continue; } - var isSvg = !util.isStr(child.className); + let isSvg = !util.isStr(child.className); if (nodeType === 1 && child.id !== 'eruda' && @@ -476,7 +476,7 @@ function getInlineStyle(style) return ret; } -var defComputedStyle = require('./defComputedStyle.json'); +let defComputedStyle = require('./defComputedStyle.json'); function rmDefComputedStyle(computedStyle) { @@ -492,9 +492,9 @@ function rmDefComputedStyle(computedStyle) return ret; } -var NO_STYLE_TAG = ['script', 'style', 'meta', 'title', 'link', 'head']; +let NO_STYLE_TAG = ['script', 'style', 'meta', 'title', 'link', 'head']; -var needNoStyle = tagName => NO_STYLE_TAG.indexOf(tagName.toLowerCase()) > -1; +let needNoStyle = tagName => NO_STYLE_TAG.indexOf(tagName.toLowerCase()) > -1; function addEvent(el, type, listener, useCapture = false) { @@ -533,6 +533,6 @@ function rmEvent(el, type, listener, useCapture = false) if (util.keys(events).length === 0) delete el.erudaEvents; } -var getWinEventProto = () => util.safeGet(window, 'EventTarget.prototype') || window.Node.prototype; +let getWinEventProto = () => util.safeGet(window, 'EventTarget.prototype') || window.Node.prototype; -var wrapLink = link => `${link}`; +let wrapLink = link => `${link}`; diff --git a/src/Elements/Highlight.es6 b/src/Elements/Highlight.es6 index 03d053f..5417c90 100644 --- a/src/Elements/Highlight.es6 +++ b/src/Elements/Highlight.es6 @@ -29,15 +29,15 @@ export default class Highlight } render() { - var {left, width, top, height} = this._$target.offset(); + let {left, width, top, height} = this._$target.offset(); this._$el.css({left, top: top - window.scrollY, width, height}); - var computedStyle = getComputedStyle(this._target, ''); + let computedStyle = getComputedStyle(this._target, ''); - var getNumStyle = name => util.pxToNum(computedStyle.getPropertyValue(name)); + let getNumStyle = name => util.pxToNum(computedStyle.getPropertyValue(name)); - var ml = getNumStyle('margin-left'), + let ml = getNumStyle('margin-left'), mr = getNumStyle('margin-right'), mt = getNumStyle('margin-top'), mb = getNumStyle('margin-bottom'); @@ -49,12 +49,12 @@ export default class Highlight height: height + mt + mb }); - var bl = getNumStyle('border-left-width'), + let bl = getNumStyle('border-left-width'), br = getNumStyle('border-right-width'), bt = getNumStyle('border-top-width'), bb = getNumStyle('border-bottom-width'); - var bw = width - bl - br, + let bw = width - bl - br, bh = height - bt - bb; this._$padding.css({ @@ -64,7 +64,7 @@ export default class Highlight height: bh }); - var pl = getNumStyle('padding-left'), + let pl = getNumStyle('padding-left'), pr = getNumStyle('padding-right'), pt = getNumStyle('padding-top'), pb = getNumStyle('padding-bottom'); @@ -93,7 +93,7 @@ export default class Highlight { $parent.append(require('./Highlight.hbs')()); - var $el = this._$el = util.$('.eruda-elements-highlight'); + let $el = this._$el = util.$('.eruda-elements-highlight'); this._$margin = $el.find('.eruda-margin'); this._$padding = $el.find('.eruda-padding'); this._$content = $el.find('.eruda-content'); @@ -103,13 +103,13 @@ export default class Highlight function formatElName(el) { - var {id, className} = el; + let {id, className} = el; - var ret = `${el.tagName.toLowerCase()}`; + let ret = `${el.tagName.toLowerCase()}`; if (id !== '') ret += `#${id}`; - var classes = ''; + let classes = ''; if (util.isStr(className)) { util.each(className.split(/\s+/g), (val) => @@ -123,4 +123,4 @@ function formatElName(el) ret += `${classes}`; return ret; -} \ No newline at end of file +} diff --git a/src/Elements/Select.es6 b/src/Elements/Select.es6 index c1dbc19..b6ef8e7 100644 --- a/src/Elements/Select.es6 +++ b/src/Elements/Select.es6 @@ -6,7 +6,7 @@ export default class Select extends util.Emitter { super(); - var self = this; + let self = this; this._startListener = function (e) { diff --git a/src/Features/Features.es6 b/src/Features/Features.es6 index d737e9c..61bb23f 100644 --- a/src/Features/Features.es6 +++ b/src/Features/Features.es6 @@ -2,9 +2,9 @@ import Tool from '../DevTools/Tool.es6' import util from '../lib/util' import modernizr from './modernizr' -var featureList = require('./featureList.json'); +let featureList = require('./featureList.json'); -var featureNames = featureList['feature-detects'], +let featureNames = featureList['feature-detects'], specialNames = featureList['special-names']; export default class Features extends Tool @@ -52,4 +52,4 @@ export default class Features extends Tool { this._$el.html(this._tpl({features: this._features})); } -} \ No newline at end of file +} diff --git a/src/Resources/Resources.es6 b/src/Resources/Resources.es6 index c6588ee..2fe505f 100644 --- a/src/Resources/Resources.es6 +++ b/src/Resources/Resources.es6 @@ -365,7 +365,7 @@ function getState(type, len) return 'eruda-ok'; } -var {hostname, pathname} = window.location; +let {hostname, pathname} = window.location; function delCookie(key) { @@ -407,4 +407,4 @@ function delCookie(key) } } -var sliceStr = (str, len) => str.length < len ? str : str.slice(0, len) + '...'; +let sliceStr = (str, len) => str.length < len ? str : str.slice(0, len) + '...'; diff --git a/src/Snippets/defSnippets.es6 b/src/Snippets/defSnippets.es6 index 7054300..69fc29e 100644 --- a/src/Snippets/defSnippets.es6 +++ b/src/Snippets/defSnippets.es6 @@ -24,7 +24,7 @@ export default [ name: 'Search Text', fn() { - var keyword = prompt('Enter the text'); + let keyword = prompt('Enter the text'); search(keyword); }, @@ -42,7 +42,7 @@ export default [ } ]; -var borderCss = '', +let borderCss = '', styleName = util.has(document.documentElement.style, 'outline') ? 'outline' : 'border', selector = 'html', colors = ['f5f5f5', 'dabb3a', 'abc1c7', '472936', 'c84941', '296dd1', '67adb4', '1ea061']; diff --git a/src/lib/JsonViewer.es6 b/src/lib/JsonViewer.es6 index 22a291d..eb6b732 100644 --- a/src/lib/JsonViewer.es6 +++ b/src/lib/JsonViewer.es6 @@ -158,4 +158,4 @@ function createEl(key, val, map, firstLevel = false) const LIGHTER_KEY = ['__proto__']; -var encode = str => util.escape(util.toStr(str)); \ No newline at end of file +let encode = str => util.escape(util.toStr(str)); diff --git a/src/lib/Storage.es6 b/src/lib/Storage.es6 index e2d457f..fc27ce8 100644 --- a/src/lib/Storage.es6 +++ b/src/lib/Storage.es6 @@ -1,10 +1,10 @@ import util from './util'; -var localStore = { +let localStore = { _storage: util.safeStorage('local'), get(key) { - var val = this._storage.getItem(key); + let val = this._storage.getItem(key); try { val = JSON.parse(val); @@ -52,7 +52,7 @@ export default class Storage extends util.Emitter } set(key, val) { - var kv; + let kv; if (util.isObj(key)) { @@ -65,11 +65,11 @@ export default class Storage extends util.Emitter util.each(kv, (val, key) => { - var preVal = this._val[key]; + let preVal = this._val[key]; this._val[key] = val; if (preVal !== val) this.emit('change', key, val); }); return this.save(); } -} \ No newline at end of file +} diff --git a/src/lib/config.es6 b/src/lib/config.es6 index 722e872..ec87876 100644 --- a/src/lib/config.es6 +++ b/src/lib/config.es6 @@ -1,8 +1,8 @@ import Storage from './Storage.es6' -var configs = {}; +let configs = {}; -var config = { +let config = { create(name) { if (!configs[name]) configs[name] = new Storage(name); @@ -11,4 +11,4 @@ var config = { } }; -export default config; \ No newline at end of file +export default config; diff --git a/src/lib/getAbstract.es6 b/src/lib/getAbstract.es6 index 45f46c6..cc5f62e 100644 --- a/src/lib/getAbstract.es6 +++ b/src/lib/getAbstract.es6 @@ -100,7 +100,7 @@ export default function getAbstract(obj, { } else if (isRegExp) { json = wrapRegExp(util.escapeJsonStr(obj.toString())); - } else if (isFn) + } else if (isFn) { json = wrapStr('function'); } else if (isArr) @@ -192,12 +192,12 @@ function canBeProto(obj) return emptyObj && proto && proto !== Object.prototype; } -function moveFnToTail(parts) +function moveFnToTail(parts) { - var front = [], + let front = [], tail = []; - util.each(parts, val => + util.each(parts, val => { val.indexOf('function') > -1 ? tail.push(val) : front.push(val); }); diff --git a/src/lib/highlight.es6 b/src/lib/highlight.es6 index cdb8bea..fc424f1 100644 --- a/src/lib/highlight.es6 +++ b/src/lib/highlight.es6 @@ -10,7 +10,7 @@ export default function highlight(str, lang) lang = language[lang]; - var subLangSi = 0, + let subLangSi = 0, subLangs = []; util.each(lang, (val) => @@ -31,11 +31,11 @@ export default function highlight(str, lang) str = str.replace(val.re, '___' + key + '___$1___end' + key + '___'); }); - var levels = []; + let levels = []; str = str.replace(/___(?!subtmpl)\w+?___/g, function($0) { - var end = $0.substr(3, 3) === 'end', + let end = $0.substr(3, 3) === 'end', tag = (!end ? $0.substr(3) : $0.substr(6)).replace(/_/g,''), lastTag = levels.length > 0 ? levels[levels.length - 1] : null; @@ -66,7 +66,7 @@ export default function highlight(str, lang) str = str.replace(/___subtmpl\d+___/g, function($tmpl) { - var i = parseInt($tmpl.replace(/___subtmpl(\d+)___/, '$1'), 10); + let i = parseInt($tmpl.replace(/___subtmpl(\d+)___/, '$1'), 10); return subLangs[i]; }); @@ -75,7 +75,7 @@ export default function highlight(str, lang) return str; } -var style = { +let style = { comment: 'color:#63a35c;', string: 'color:#183691;', number: 'color:#0086b3;', @@ -83,7 +83,7 @@ var style = { operators: 'color:#a71d5d;' }; -var language = {}; +let language = {}; language.js = { comment: {re: /(\/\/.*|\/\*([\s\S]*?)\*\/)/g, style: 'comment'}, diff --git a/src/lib/stringify.es6 b/src/lib/stringify.es6 index 35e71e5..add0e45 100644 --- a/src/lib/stringify.es6 +++ b/src/lib/stringify.es6 @@ -30,7 +30,7 @@ export default function stringify(obj, { type = getType(obj); - var isFn = (type == '[object Function]'), + let isFn = (type == '[object Function]'), isStr = (type == '[object String]'), isArr = (type == '[object Array]'), isObj = (type == '[object Object]'), @@ -60,7 +60,7 @@ export default function stringify(obj, { keys = names.keys; allKeys = names.allKeys; names = unenumerable ? allKeys : keys; - + proto = Object.getPrototypeOf(obj); if (circularMarker && proto === Object.prototype) proto = null; if (proto) @@ -188,7 +188,7 @@ export default function stringify(obj, { return json; } -function getKeys(obj) +function getKeys(obj) { let allKeys = Object.getOwnPropertyNames(obj), keys = Object.keys(obj).sort(sortObjName); @@ -216,7 +216,7 @@ function sortObjName(a, b) if (lenA > lenB) return 1; if (lenA < lenB) return -1; - + return 0; }