From 8927501eca8eafa1db171efe404bb4d8c82983da Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 26 Dec 2021 22:49:41 -0500 Subject: [PATCH] normalize moto module header --- src/moto/ajax.js | 12 +++++------- src/moto/kv.js | 2 +- src/moto/load-3mf.js | 6 +++--- src/moto/load-file.js | 15 ++++++++------- src/moto/load-obj.js | 6 +++--- src/moto/load-stl.js | 6 +++--- src/moto/load-svg.js | 6 +++--- src/moto/load-url.js | 13 +++++++------ src/moto/pack.js | 10 +++++----- src/moto/space.js | 4 +--- src/moto/ui.js | 2 +- 11 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/moto/ajax.js b/src/moto/ajax.js index c414669a..1ecf7727 100644 --- a/src/moto/ajax.js +++ b/src/moto/ajax.js @@ -4,14 +4,12 @@ (function() { - if (!self.moto) self.moto = {}; - if (self.moto.Ajax) return; + let moto = self.moto = self.moto || {}; + if (moto.Ajax) return; - const MOTO = self.moto; + moto.Ajax = Ajax; - MOTO.Ajax = Ajax; - - MOTO.callAjax = function(url, handler) { + moto.callAjax = function(url, handler) { new Ajax(handler).request(url); }; @@ -21,7 +19,7 @@ TIME = function() { return new Date().getTime() }, MOKEY = moto.id = KV.getItem(KEY) || (TIME().toString(36)+rnd()+rnd()); - MOTO.restore = function(id) { + moto.restore = function(id) { MOKEY = moto.id = id; KV.setItem(KEY, MOKEY); } diff --git a/src/moto/kv.js b/src/moto/kv.js index 452b41cc..f13cafab 100644 --- a/src/moto/kv.js +++ b/src/moto/kv.js @@ -4,7 +4,7 @@ (function() { - let moto = self.moto = self.moto = {}; + let moto = self.moto = self.moto || {}; if (moto.KV) return; function KV() { diff --git a/src/moto/load-3mf.js b/src/moto/load-3mf.js index 767e8653..c96b6e61 100644 --- a/src/moto/load-3mf.js +++ b/src/moto/load-3mf.js @@ -2,10 +2,10 @@ (function() { - if (!self.moto) self.moto = {}; - if (self.moto.OBJ) return; + let moto = self.moto = self.moto || {}; + if (moto.TMF) return; - self.moto.TMF = { + moto.TMF = { parseAsync }; diff --git a/src/moto/load-file.js b/src/moto/load-file.js index 136932e9..c33bf51b 100644 --- a/src/moto/load-file.js +++ b/src/moto/load-file.js @@ -1,8 +1,14 @@ 'use strict'; (function() { - if (!self.moto) self.moto = {}; - if (self.moto.File) return; + + let moto = self.moto = self.moto || {}; + if (moto.File) return; + + moto.File = { + load_data, + load + }; function load_data(data, file, ext) { ext = ext || name.toLowerCase().split('.').pop(); @@ -52,9 +58,4 @@ }); } - self.moto.File = { - load_data, - load - }; - })(); diff --git a/src/moto/load-obj.js b/src/moto/load-obj.js index b4cce068..b70b99e7 100644 --- a/src/moto/load-obj.js +++ b/src/moto/load-obj.js @@ -2,10 +2,10 @@ (function() { - if (!self.moto) self.moto = {}; - if (self.moto.OBJ) return; + let moto = self.moto = self.moto || {}; + if (moto.OBJ) return; - self.moto.OBJ = { + moto.OBJ = { parse, parseAsync }; diff --git a/src/moto/load-stl.js b/src/moto/load-stl.js index 2e3f2a43..3f259952 100644 --- a/src/moto/load-stl.js +++ b/src/moto/load-stl.js @@ -8,13 +8,13 @@ (function() { - if (!self.moto) self.moto = {}; - if (self.moto.STL) return; + let moto = self.moto = self.moto || {}; + if (moto.STL) return; const SP = STL.prototype; const CDH = 'Content-Disposition'; - self.moto.STL = STL; + moto.STL = STL; /** * @constructor diff --git a/src/moto/load-svg.js b/src/moto/load-svg.js index 376595db..ea3d4c11 100644 --- a/src/moto/load-svg.js +++ b/src/moto/load-svg.js @@ -2,10 +2,10 @@ (function() { - if (!self.moto) self.moto = {}; - if (self.moto.SVG) return; + let moto = self.moto = self.moto || {}; + if (moto.SVG) return; - self.moto.SVG = { + moto.SVG = { parse, parseAsync }; diff --git a/src/moto/load-url.js b/src/moto/load-url.js index 5d43c9b1..585d8494 100644 --- a/src/moto/load-url.js +++ b/src/moto/load-url.js @@ -1,8 +1,13 @@ 'use strict'; (function() { - if (!self.moto) self.moto = {}; - if (self.moto.URL) return; + + let moto = self.moto = self.moto || {}; + if (moto.URL) return; + + moto.URL = { + load + }; const CDH = 'Content-Disposition'; @@ -77,8 +82,4 @@ }); }; - self.moto.URL = { - load - }; - })(); \ No newline at end of file diff --git a/src/moto/pack.js b/src/moto/pack.js index 0a8a7b81..a3dcc255 100644 --- a/src/moto/pack.js +++ b/src/moto/pack.js @@ -7,13 +7,13 @@ * http://codeincomplete.com/posts/2011/5/7/bin_packing/ */ -(function (){ +(function () { - if (!self.moto) self.moto = {}; - if (self.moto.Pack) return; + let moto = self.moto = self.moto || {}; + if (moto.Pack) return; - self.moto.Pack = Packer; - self.moto.Sort = function (a, b) { + moto.Pack = Packer; + moto.Sort = function (a, b) { let aa = (a.w * a.h); let ab = (b.w * b.h); if (Math.abs(aa-ab) < 1) { diff --git a/src/moto/space.js b/src/moto/space.js index 2ca2fd0d..6650e289 100644 --- a/src/moto/space.js +++ b/src/moto/space.js @@ -4,9 +4,7 @@ (function() { - if (!self.moto) self.moto = {}; - - let MOTO = self.moto, + let MOTO = self.moto = self.moto || {}, WIN = window, DOC = document, SCENE = new THREE.Scene(), diff --git a/src/moto/ui.js b/src/moto/ui.js index 7276ba09..c667ec45 100644 --- a/src/moto/ui.js +++ b/src/moto/ui.js @@ -4,7 +4,7 @@ (function() { - if (!self.moto) self.moto = {}; + let moto = self.moto = self.moto || {}; if (moto.ui) return; let SELF = self,