refactor(modules) add dom

client/cloudcmd.js

@@ -16,7 +16,7 @@ window.CloudCmd = (config) => {
     window.DOM = DOM;
     window.CloudCmd = require('./client');
     
-    const Dialog = require('./dialog');
+    const Dialog = require('./dom/dialog');
     
     const prefix = getPrefix(config.prefix);
     const {htmlDialogs} = config;
@@ -27,7 +27,6 @@ window.CloudCmd = (config) => {
     
     require('./listeners');
     require('./key');
-    require('./directory');
     require('./sort');
     
     window.CloudCmd.init(prefix, config);

client/dom/buffer.js

@@ -6,7 +6,7 @@ const jonny = require('jonny');
 const exec = require('execon');
 
 const Storage = require('./storage');
-const DOM = require('./dom');
+const DOM = require('./');
 
 module.exports = new BufferProto();
 

client/dom/directory.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const Images = require('./dom/images');
+const Images = require('./images');
 
 module.exports = (items) => {
     const Info = DOM.CurrentInfo;

client/dom/index.js

@@ -7,7 +7,7 @@ const itype = require('itype/legacy');
 const rendy = require('rendy');
 const exec = require('execon');
 const jonny = require('jonny');
-const Util = require('../common/util');
+const Util = require('../../common/util');
 
 const DOMFunc = function() {};
 
@@ -20,7 +20,7 @@ const DOM = new DOMFunc();
 
 module.exports = DOM;
 
-const Images = require('./dom/images');
+const Images = require('./images');
 const load = require('./load');
 
 DOM.Images = Images;

client/dom/load.js

@@ -4,10 +4,10 @@ const itype = require('itype/legacy');
 const jonny = require('jonny');
 const Emitify = require('emitify');
 const exec = require('execon');
-const Images = require('./dom/images');
+const Images = require('./images');
 const Events = require('./events');
 
-const {getExt} = require('../common/util');
+const {getExt} = require('../../common/util');
 
 module.exports = load;
 module.exports.getIdBySrc = getIdBySrc;

client/dom/rest.js

@@ -6,7 +6,7 @@ const itype = require('itype/legacy');
 
 module.exports = new RESTful();
 
-const {Images} = require('./dom');
+const Images = require('./images');
 const load = require('./load');
 
 function RESTful() {

client/key.js

@@ -6,8 +6,8 @@ const Info = DOM.CurrentInfo;
 
 const exec = require('execon');
 
-const Events = require('./events');
-const Buffer = require('./buffer');
+const Events = require('./dom/events');
+const Buffer = require('./dom/buffer');
 const {escapeRegExp} = require('../common/util');
 
 let Chars = [];

client/modules/cloud.js

@@ -6,8 +6,8 @@ CloudCmd.Cloud = CloudProto;
 
 const exec = require('execon');
 
-const load = require('../load');
-const Files = require('../files');
+const load = require('../dom/load');
+const Files = require('../dom/files');
 const Images = require('../dom/images');
 const Util = require('../../common/util');
 

client/modules/config.js

@@ -8,8 +8,9 @@ const currify = require('currify/legacy');
 const input = require('../input');
 
 const Images = require('../dom/images');
-const Events = require('../events');
-const Files = require('../files');
+const Events = require('../dom/events');
+const Files = require('../dom/files');
+
 const {Dialog} = DOM;
 
 const TITLE = 'Config';

client/modules/edit.js

@@ -5,7 +5,7 @@
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('../load');
+const load = require('../dom/load');
 const {time, timeEnd} = require('../../common/util');
 
 CloudCmd.Edit = EditProto;

client/modules/markdown.js

@@ -7,8 +7,8 @@ CloudCmd.Markdown = MarkdownProto;
 const exec = require('execon');
 
 const Images = require('../dom/images');
-const load = require('../load');
-const {Markdown} = require('../rest');
+const load = require('../dom/load');
+const {Markdown} = require('../dom/rest');
 
 function MarkdownProto(name, options) {
     Images.show.load('top');

client/modules/menu.js

@@ -7,8 +7,8 @@ CloudCmd.Menu = MenuProto;
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('../load');
-const RESTful = require('../rest');
+const load = require('../dom/load');
+const RESTful = require('../dom/rest');
 const bind = (f, ...a) => (...b) => f(...a, ...b);
 
 function MenuProto(position) {

client/modules/operation.js

@@ -14,7 +14,7 @@ CloudCmd.Operation = OperationProto;
 const currify = require('currify/legacy');
 const exec = require('execon');
 
-const RESTful = require('../rest');
+const RESTful = require('../dom/rest');
 
 function OperationProto(operation, data) {
     const Name = 'Operation';

client/modules/upload.js

@@ -4,9 +4,9 @@
 
 const exec = require('execon');
 
-const load = require('../load');
-const Files = require('../files');
-const {Images} = DOM;
+const load = require('../dom/load');
+const Files = require('../dom/files');
+const Images = require('../dom/images');
 
 CloudCmd.Upload = UploadProto;
 

client/modules/view.js

@@ -7,9 +7,9 @@ const rendy = require('rendy');
 const exec = require('execon');
 
 const {time} = require('../../common/util');
-const Files = require('../files');
-const Events = require('../events');
-const load = require('../load');
+const Files = require('../dom/files');
+const Events = require('../dom/events');
+const load = require('../dom/load');
 const Images = require('../dom/images');
 
 CloudCmd.View = ViewProto;

webpack.config.js

@@ -66,7 +66,14 @@ module.exports = {
                 presets: ['es2015']
             }
         }]
+    },
+    /*
+    resolve: {
+        alias: {
+            dom: `${dir}/dom`
+        }
     }
+    */
 };
 
 function externals(context, request, fn) {