Clean code.

package.json

@@ -16,9 +16,9 @@
   "devDependencies": {
     "babel-loader": "6.2.4",
     "babel-preset-es2015": "6.9.0",
-    "eslint": "3.0.0",
+    "eslint": "3.0.1",
-    "ghu": "0.6.0",
+    "ghu": "0.7.0",
-    "scar": "0.11.0"
+    "scar": "0.13.0"
   },
   "engines": {
     "node": ">=6.0.0"

src/_h5ai/public/js/lib/ext/preview/index.js

@@ -0,0 +1,5 @@
+require('./preview');
+require('./preview-aud');
+require('./preview-img');
+require('./preview-txt');
+require('./preview-vid');

src/_h5ai/public/js/lib/ext/preview/preview-aud.js

@@ -1,8 +1,8 @@
-const {each, includes, compact, dom} = require('../util');
+const {each, includes, compact, dom} = require('../../util');
-const {win} = require('../globals');
+const {win} = require('../../globals');
-const event = require('../core/event');
+const event = require('../../core/event');
-const format = require('../core/format');
+const format = require('../../core/format');
-const allsettings = require('../core/settings');
+const allsettings = require('../../core/settings');
 const preview = require('./preview');
 
 const settings = Object.assign({
@@ -18,62 +18,63 @@ const preloadAudio = (src, callback) => {
         .attr('src', src);
 };
 
+const onAdjustSize = () => {
+    const $audio = dom('#pv-aud-audio');
+    if (!$audio.length) {
+        return;
+    }
+
+    const elContent = dom('#pv-content')[0];
+    const contentW = elContent.offsetWidth;
+    const contentH = elContent.offsetHeight;
+    const audioW = $audio[0].offsetWidth;
+    const audioH = $audio[0].offsetHeight;
+
+    $audio.css({
+        left: (contentW - audioW) * 0.5 + 'px',
+        top: (contentH - audioH) * 0.5 + 'px'
+    });
+};
+
 const onEnter = (items, idx) => {
     const currentItems = items;
     let currentIdx = idx;
     let currentItem = items[idx];
+    let spinnerTimeout;
 
-    const onAdjustSize = () => {
+    const updateMeta = () => {
-        const $content = dom('#pv-content');
+        preview.setLabels([
-        const $audio = dom('#pv-aud-audio');
+            currentItem.label,
+            format.formatDate(dom('#pv-aud-audio')[0].duration * 1000, 'm:ss')
+        ]);
 
-        if ($audio.length) {
+        preview.setIndex(currentIdx + 1, currentItems.length);
-            const contentW = $content[0].offsetWidth;
+        preview.setRawLink(currentItem.absHref);
-            const contentH = $content[0].offsetHeight;
+    };
-            const audioW = $audio[0].offsetWidth;
-            const audioH = $audio[0].offsetHeight;
 
-            $audio.css({
+    const onReady = $preloadedContent => {
-                left: (contentW - audioW) * 0.5 + 'px',
+        win.clearTimeout(spinnerTimeout);
-                top: (contentH - audioH) * 0.5 + 'px'
+        preview.showSpinner(false);
-            });
 
-            preview.setLabels([
+        dom('#pv-content')
-                currentItem.label,
+            .hide()
-                format.formatDate($audio[0].duration * 1000, 'm:ss')
+            .clr()
-            ]);
+            .app($preloadedContent.attr('id', 'pv-aud-audio'))
-        }
+            .show();
+
+        updateMeta();
+        onAdjustSize();
     };
 
     const onIdxChange = rel => {
         currentIdx = (currentIdx + rel + currentItems.length) % currentItems.length;
         currentItem = currentItems[currentIdx];
 
-        const spinnerTimeout = win.setTimeout(() => preview.showSpinner(true), 200);
+        spinnerTimeout = win.setTimeout(() => preview.showSpinner(true), 200);
 
         if (dom('#pv-aud-audio').length) {
             dom('#pv-aud-audio')[0].pause();
         }
-
-        const updateMeta = () => {
-            onAdjustSize();
-            preview.setIndex(currentIdx + 1, currentItems.length);
-            preview.setRawLink(currentItem.absHref);
-        };
-
-        const swap = nuContent => {
-            dom('#pv-content').clr().app(nuContent.attr('id', 'pv-aud-audio')).show();
-            updateMeta();
-        };
-
-        const onReady = $preloadedContent => {
-            win.clearTimeout(spinnerTimeout);
-            preview.showSpinner(false);
-
-            dom('#pv-content').hide();
-            swap($preloadedContent);
-        };
-
         preloadAudio(currentItem.absHref, onReady);
     };
 

src/_h5ai/public/js/lib/ext/preview/preview-img.js

@@ -1,8 +1,8 @@
-const {each, includes, compact, dom} = require('../util');
+const {each, includes, compact, dom} = require('../../util');
-const {win} = require('../globals');
+const {win} = require('../../globals');
-const server = require('../server');
+const server = require('../../server');
-const event = require('../core/event');
+const event = require('../../core/event');
-const allsettings = require('../core/settings');
+const allsettings = require('../../core/settings');
 const preview = require('./preview');
 
 const settings = Object.assign({

src/_h5ai/public/js/lib/ext/preview/preview-txt.js

@@ -1,7 +1,7 @@
-const {each, keys, includes, compact, dom} = require('../util');
+const {each, keys, includes, compact, dom} = require('../../util');
-const {win, marked, prism} = require('../globals');
+const {win, marked, prism} = require('../../globals');
-const event = require('../core/event');
+const event = require('../../core/event');
-const allsettings = require('../core/settings');
+const allsettings = require('../../core/settings');
 const preview = require('./preview');
 
 

src/_h5ai/public/js/lib/ext/preview/preview-vid.js

@@ -1,7 +1,7 @@
-const {each, includes, compact, dom} = require('../util');
+const {each, includes, compact, dom} = require('../../util');
-const {win} = require('../globals');
+const {win} = require('../../globals');
-const event = require('../core/event');
+const event = require('../../core/event');
-const allsettings = require('../core/settings');
+const allsettings = require('../../core/settings');
 const preview = require('./preview');
 
 const settings = Object.assign({

src/_h5ai/public/js/lib/ext/preview/preview.js

@@ -1,8 +1,8 @@
-const {each, isFn, isNum, dom} = require('../util');
+const {each, isFn, isNum, dom} = require('../../util');
-const {win} = require('../globals');
+const {win} = require('../../globals');
-const resource = require('../core/resource');
+const resource = require('../../core/resource');
-const allsettings = require('../core/settings');
+const allsettings = require('../../core/settings');
-const store = require('../core/store');
+const store = require('../../core/store');
 
 
 const settings = Object.assign({

src/_h5ai/public/js/lib/main/index.js

@@ -13,10 +13,6 @@ require('../ext/info');
 require('../ext/l10n');
 require('../ext/piwik-analytics');
 require('../ext/preview');
-require('../ext/preview-aud');
-require('../ext/preview-img');
-require('../ext/preview-txt');
-require('../ext/preview-vid');
 require('../ext/search');
 require('../ext/select');
 require('../ext/sort');