examples/forms/editable_elements/index.html

@@ -6,7 +6,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <link rel="shortcut icon" type="image/png" href="../../../source/UI/themes/oxlight/png/icon16.png"/>
         <link rel="stylesheet" type="text/css" href="css/example.css"/>
-        <script type="text/javascript" src="../../../min/Ox.js"></script>
+        <script type="text/javascript" src="../../../dev/Ox.js"></script>
         <script type="text/javascript" src="js/example.js"></script>
         <script>window.addEventListener('message', function(e) { e.origin == window.location.origin && eval('(' + e.data + ')'); });</script>
     </head>

index.js

@@ -251,13 +251,10 @@ Ox.load(/^https?:\/\/(www\.)?oxjs\.org\//.test(
                     Ox.get('readme/index/' + id + '.html' + q, function(html) {
                         app.data.html[id] = html;
                         if (Ox.len(app.data.html) == app.data.pages.length) {
-                            /*
                             navigator.onLine ? Ox.getJSON(url, function(data) {
                                 app.data.downloads = data;
                                 callback();
                             }) : callback();
-                            */
-                            callback()
                         }
                     });
                 });

package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@0x2620/oxjs",
-  "version": "1.0.0",
-  "main": "min/Ox/Ox.js",
-  "module": "min/Ox/Ox.js",
-  "browser": "min/Ox.js",
-  "type": "module",
-  "devDependencies": {
-    "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
-    "rollup": "^2.79.2",
-    "rollup-plugin-copy": "^3.5.0"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w"
-  },
-  "files": [
-    "min"
-  ]
-}

rollup.config.js

@@ -1,261 +0,0 @@
-import resolve from '@rollup/plugin-node-resolve';
-import terser from '@rollup/plugin-terser';
-import copy from 'rollup-plugin-copy';
-import fs from 'fs';
-import path from 'path';
-
-import { version } from './package.json';
-
-function install(options = {}) {
-  const sourcePath = options.sourcePath || 'source/';
-  const devPath = options.devPath || 'dev/';
-  const minPath = options.minPath || 'min/';
-
-  // Helper: parse CSS with variable substitutions
-  function parseCss(css, values) {
-    return css.replace(/\$(\w+)(\[\d+\])?/g, (match, key, index) => {
-      let value = values[key];
-      if (index) {
-        const idx = parseInt(index.slice(1, -1));
-        value = value[idx];
-      }
-
-      if (typeof value === 'string') {
-        return value;
-      }
-
-      // Handle numeric arrays (e.g., RGB or RGBA)
-      if (Array.isArray(value[0])) {
-        // Already nested arrays
-        return value
-          .map(vals => `rgb${vals.length === 4 ? 'a' : ''}(${vals.join(', ')})`)
-          .join(', ');
-      } else {
-        // Single array
-        return `rgb${value.length === 4 ? 'a' : ''}(${value.join(', ')})`;
-      }
-    });
-  }
-
-    function readJsonc(filePath) {
-        const jsoncText = fs.readFileSync(filePath, 'utf-8');
-        let text = jsoncText.replace(/\/\/.*$/gm, ''); // Remove single-line comments
-        text = text.replace(/\/\*[\s\S]*?\*\//g, '');  // Remove multi-line comments
-        text = text.replace(/,\s*(?=[}\]])/g, '');     // Remove trailing commas in objects and arrays
-
-        return JSON.parse(text);
-    }
-
-  function writeFile(filePath, data) {
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    fs.writeFileSync(filePath, typeof data === 'string' ? data : data.toString('utf-8'));
-    return data.length;
-  }
-
-  function formatColor(rgb) {
-    return '#' + rgb.map(c => c.toString(16).padStart(2, '0').toUpperCase()).join('');
-  }
-
-  function writeBundle() {
-      const themesDir = path.join(sourcePath, 'UI', 'themes');
-      const themes = fs.readdirSync(themesDir).filter(name => !['.', '_'].includes(name[0]));
-
-      const themeData = {};
-      for (const theme of themes) {
-        const themeJsonPath = path.join(themesDir, theme, 'json', 'theme.jsonc');
-        themeData[theme] = readJsonc(themeJsonPath);
-        themeData[theme].themeClass = 'OxTheme' + theme[0].toUpperCase() + theme.slice(1);
-      }
-
-      const cssPath = path.join(sourcePath, 'UI', 'css', 'theme.css');
-      const css = fs.readFileSync(cssPath, 'utf-8')
-
-      for (const theme of themes) {
-        let themeCss = parseCss(css, themeData[theme]);
-        themeCss = themeCss.replace(/\.png\)/g, `.png?${version})`);
-
-        writeFile(path.join(devPath, 'UI', 'themes', theme, 'css', 'theme.css'), themeCss);
-        writeFile(path.join(minPath, 'UI', 'themes', theme, 'css', 'theme.css'), themeCss);
-      }
-
-      const uiImages = {}
-      const svgDir = path.join(sourcePath, 'UI', 'svg');
-      const svgs = fs.readdirSync(svgDir).filter(name => !['.', '_'].includes(name[0]));
-      for (const filename of svgs) {
-        const svgPath = path.join(svgDir, filename);
-        let svg = fs.readFileSync(svgPath, 'utf-8')
-        svg = svg.replace(/\n\s*/g, '');
-        svg = svg.replace(/<!--.+?-->/g, '');
-        uiImages[filename.slice(0, -4)] = svg
-        if (filename.startsWith('symbolLoading')) {
-          for (const theme of themes) {
-            let themeSVG = svg.replace(/#808080/g, formatColor(themeData[theme]['symbolDefaultColor']))
-            writeFile(path.join(devPath, 'UI', 'themes', theme, 'svg', filename), themeSVG);
-            writeFile(path.join(minPath, 'UI', 'themes', theme, 'svg', filename), themeSVG);
-          }
-        }
-      }
-    }
-
-  return {
-    name: 'install-plugin',
-    writeBundle
-  };
-}
-
-function symlinkDevPlugin(options = {}) {
-  const sourcePath = options.source || 'source';
-  const devPath = options.dev || 'dev';
-
-  function shouldInclude(filePath, filename) {
-    if (filePath.includes('_')) return false;
-    if (filename.startsWith('.') || filename.startsWith('_')) return false;
-    if (filename.endsWith('~')) return false;
-    if (filePath.includes(`${path.sep}UI${path.sep}svg`)) return false;
-    return true;
-  }
-
-  function ensureDir(dir) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-
-  function removeIfExists(target) {
-    if (fs.existsSync(target) || fs.lstatSync(target, { throwIfNoEntry: false })) {
-      try {
-        const stat = fs.lstatSync(target);
-        if (stat.isSymbolicLink()) {
-          fs.unlinkSync(target);
-        } else if (stat.isDirectory()) {
-          fs.rmdirSync(target);
-        } else  {
-            console.log("not symlink, what to do?", target)
-        }
-      } catch (err) {
-        // ignore if it doesn't exist anymore
-      }
-    }
-  }
-
-  function walk(dir) {
-    const entries = fs.readdirSync(dir, { withFileTypes: true });
-
-    for (const entry of entries) {
-      const fullPath = path.join(dir, entry.name);
-
-      if (entry.isDirectory()) {
-        walk(fullPath);
-      } else if (entry.isFile()) {
-        if (!shouldInclude(dir, entry.name)) continue;
-
-        const relativePath = path.relative(sourcePath, dir);
-        const targetDir = path.join(devPath, relativePath);
-        const targetPath = path.join(targetDir, entry.name);
-        const relativeSource = path.relative(targetDir, fullPath);
-        ensureDir(targetDir);
-        removeIfExists(targetPath);
-        if (!fs.existsSync(targetPath)) {
-            fs.symlinkSync(relativeSource, targetPath);
-        }
-      }
-    }
-  }
-
-  return {
-    name: 'symlink-dev-plugin',
-
-    writeBundle() {
-      if (!fs.existsSync(sourcePath)) {
-        this.warn(`Source path "${sourcePath}" does not exist.`);
-        return;
-      }
-
-      walk(sourcePath);
-    }
-  };
-}
-
-
-// TBD: get version
-// TBD: add ' OxJS %s (c) %s 0x2620, dual-licensed GPL/MIT, see https://oxjs.org for details ' % (version, year)
-//
-/*
-
-    // kind of inline now, but missing cache busting!
-    # Ox.UI CSS
-    css = read_text(source_path + 'UI/css/UI.css')
-    css = css.replace('$import', '\n'.join([
-        '@import url("../themes/%s/css/theme.css?%s");' % (theme, version) for theme in themes
-    ]))
-    write_file('%sUI/css/UI.css' % dev_path, css)
-    write_file('%sUI/css/UI.css' % min_path, css)
-
-    # Ox.UI SVGs
-    ui_images = {}
-    path = source_path + 'UI/svg/'
-    for filename in [filename for filename in os.listdir(path) if not filename[0] in '._']:
-        svg = read_text(path + filename)
-        svg = re.sub(r'\n\s*', '', svg)
-        svg = re.sub(r'<!--.+?-->', '', svg)
-        # end fix
-        ui_images[filename[:-4]] = svg
-        if filename.startswith('symbolLoading'):
-            for theme in themes:
-                theme_svg = re.sub(r'#808080', format_hex(theme_data[theme]['symbolDefaultColor']), svg)
-                write_file('%sUI/themes/%s/svg/%s' % (dev_path, theme, filename), theme_svg)
-                write_file('%sUI/themes/%s/svg/%s' % (min_path, theme, filename), theme_svg)
-
-    write_file(min_path + 'UI/json/UI.json', json.dumps({
-        'files': sorted(ui_files['min']),
-        'images': ui_images
-    }, sort_keys=True))
-
-    js = re.sub(
-        r'Ox.LOCALES = \{\}',
-        'Ox.LOCALES = ' + json.dumps(locales, indent=4, sort_keys=True),
-        js
-    )
-    js = re.sub(
-        r"Ox.VERSION = '([\d\.]+)'",
-        "Ox.VERSION = '%s'" % version,
-        js
-    )
-*/
-
-
-export default {
-  input: {
-    'Ox': 'source/Ox/Ox.js',
-    'UI': 'source/UI/UI.js',
-    'Unicode': 'source/Unicode/Unicode.js',
-    'Geo': 'source/Geo/Geo.js',
-    'Image': 'source/Image/Image.js',
-  },
-  output: {
-    dir: 'min',
-    format: 'es',
-    entryFileNames: '[name]/[name].js',
-    chunkFileNames: '[name]/[name].js',
-  },
-  plugins: [
-    resolve(),
-    terser(),
-    copy({
-        targets: [
-            { src: "source/Ox.js", dest: 'min/' },
-            { src: "source/Ox/json/locale.*.json", dest: 'min/Ox/json' },
-            { src: "source/UI/css/*.css", dest: 'min/UI/css' },
-            { src: "source/UI/json/locale.*.json", dest: 'min/UI/json' },
-            { src: "source/UI/json/UI.json", dest: 'min/UI/json/' }, // FIXME: this one should be genreated first
-            { src: "source/UI/png", dest: 'min/UI/' },
-            { src: "source/UI/jquery/*.js", dest: 'min/UI/jquery' },
-            { src: "source/UI/themes", dest: 'min/UI' },
-            { src: "source/Unicode/json/*.json", dest: 'min/Unicode/json' },
-            { src: "source/Geo/json/*.json", dest: 'min/Geo/json' },
-            { src: "source/Geo/png/flags", dest: 'min/Geo/png/'}
-        ],
-        hook: 'writeBundle'
-    }),
-    install(),
-    symlinkDevPlugin()
-  ]
-};

source/Geo/Geo.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../Ox/js/Ox.Global.js';
 
 Ox.load.Geo = function(options, callback) {
 

source/Image/Image.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../Ox/js/Ox.Global.js';
 
 Ox.load.Image = function(options, callback) {
 

source/Ox.js

@@ -1,12 +1,40 @@
 'use strict';
 
-(async function(global) {
+(function(global) {
-    const initLoad = [];
+
     global.Ox = {
-        load: function(...args) {
+
-            initLoad.push(args)
+        load: function() {
+
+            var args = arguments,
+                callback = args[args.length - 1],
+                path = getPath(),
+                regexp = /dev\/$/,
+                version = +new Date();
+
+            if (args[0] === true && regexp.test(path)) {
+                path = path.replace(regexp, 'min/');
+                loadScript('Ox.js', function() {
+                    Ox.MODE = 'min';
+                    Ox.PATH = path;
+                    Ox.load.apply(null, Ox.slice(args, 1));
+                });
+            } else {
+                loadJSON(function(data) {
+                    var previousOx = global.Ox;
+                    version = data.version;
+                    loadScriptsSerial(data.files, function() {
+                        Ox.LOCALES = data.locales;
+                        Ox.VERSION = data.version;
+                        Ox.forEach(previousOx, function(value, key) {
+                            if (Ox.isUndefined(Ox[key])) {
+                                Ox[key] = value;
+                            }
+                        });
+                        Ox.load.apply(null, args);
+                    });
+                });
             }
-    };
 
             function getPath() {
                 var index, regexp = /Ox\.js(\?[\d\.]+|)$/,
@@ -19,10 +47,60 @@
                 }
             }
 
-    const module = await import('./Ox/Ox.js');
+            function loadJSON(callback) {
-    if (Ox.MODE == 'source') {
+                var request = new XMLHttpRequest(),
-        Ox.MODE = 'dev';
+                    time = +new Date();
+                request.open('GET', path + 'Ox/json/Ox.json?' + time, true);
+                request.onreadystatechange = function() {
+                    if (request.readyState == 4) {
+                        if (request.status == 200) {
+                            callback(JSON.parse(request.responseText));
                         }
-    console.log("Ox was loaded", Ox.MODE, Ox.PATH);
+                    }
-    initLoad.forEach((args) => global.Ox.load.apply(null, args))
+                };
-}(globalThis));
+                request.send();
+            }
+
+            function loadScript(script, callback) {
+                var element = document.createElement('script'),
+                    head = document.head
+                        || document.getElementsByTagName('head')[0]
+                        || document.documentElement;
+                element.onload = element.onreadystatechange = function() {
+                    if (
+                        !this.readyState
+                        || this.readyState == 'loaded'
+                        || this.readyState == 'complete'
+                    ) {
+                        callback();
+                    }
+                }
+                element.src = path + script + '?' + version;
+                element.type = 'text/javascript';
+                head.appendChild(element);
+            }
+
+            function loadScriptsParallel(scripts, callback) {
+                var i = 0, n = scripts.length;
+                while (scripts.length) {
+                    loadScript(scripts.shift(), function() {
+                        ++i == n && callback();
+                    });
+                }
+            }
+
+            function loadScriptsSerial(scripts, callback) {
+                loadScriptsParallel(scripts.shift(), function() {
+                    if (scripts.length) {
+                        loadScriptsSerial(scripts, callback);
+                    } else {
+                        callback();
+                    }
+                });
+            }
+
+        }
+
+    };
+
+}(this));

source/Ox/Ox.js

@@ -1,45 +0,0 @@
-'use strict';
-
-import Ox from './js/Ox.Global.js';
-
-import './js/Core.js';
-import './js/Function.js';
-import './js/Polyfill.js';
-import './js/Array.js';
-import './js/String.js';
-import './js/Collection.js';
-import './js/Math.js';
-
-import './js/Async.js';
-import './js/Color.js';
-import './js/Constants.js';
-import './js/Date.js';
-import './js/DOM.js';
-import './js/Encoding.js';
-import './js/Format.js';
-import './js/Geo.js';
-import './js/Hash.js';
-import './js/HTML.js';
-import './js/JavaScript.js';
-import './js/Locale.js';
-import './js/Object.js';
-import './js/RegExp.js';
-import './js/Request.js';
-import './js/Type.js';
-import './js/Video.js';
-
-export default Ox;
-export { Ox };
-
-// For backward compatibility with global usage
-if (typeof globalThis !== 'undefined') {
-    // FIXME: examples/ui/widget_design_patterns writes to Ox before load
-    if (typeof globalThis.Ox != 'undefined') {
-        Object.keys(globalThis.Ox).forEach(key => {
-            if (typeof Ox[key] == 'undefined') {
-                Ox[key] = globalThis.Ox[key]
-            }
-        })
-    }
-    globalThis.Ox = Ox;
-}

source/Ox/js/Array.js

@@ -1,7 +1,5 @@
 'use strict';
 
-import Ox from './Ox.Global.js';
-
 /*@
 Ox.api <f> Turns an array into a list API
     `Ox.api` takes an array and returns a function that allows you to run

source/Ox/js/Async.js

@@ -1,7 +1,5 @@
 'use strict';
 
-import Ox from './Ox.Global.js';
-
 (function() {
 
     function asyncMap(forEach, collection, iterator, that, callback) {

source/Ox/js/Collection.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.avg <f> Returns the average of an array's values, or an object's properties
@@ -466,7 +465,6 @@ Ox.slice = Ox.toArray = function(collection, start, stop) {
 // value. Firefox 3.6 returns an array of undefined values if a string is passed
 // as value.
 if (
-    typeof document !== 'undefined' && (
     Ox.slice([0]).length == 0
     || Ox.slice('0')[0] === null
     || Ox.slice('0')[0] === void 0
@@ -475,7 +473,7 @@ if (
             return Ox.slice(document.getElementsByTagName('a'));
         } catch (error) {}
     }())
-)) {
+) {
     // FIXME: remove toArray alias
     Ox.slice = Ox.toArray = function(collection, start, stop) {
         var args = stop === void 0 ? [start] : [start, stop],

source/Ox/js/Color.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.hsl <f> Takes RGB values and returns HSL values

source/Ox/js/Constants.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 //@ Ox.AMPM <[s]> ['AM', 'PM']
 Ox.AMPM = ['AM', 'PM'];
@@ -93,7 +92,6 @@ Ox.SHORT_MONTHS = Ox.MONTHS.map(function(val) {
 });
 //@ Ox.PATH <s> Path of Ox.js
 Ox.PATH = (function() {
-    if (typeof document !== 'undefined') {
     // IE8 can't apply slice to NodeLists, see Ox.slice
     var index, regexp = /Ox\.js(\?.+|)$/,
         scripts = document.getElementsByTagName('script'), src;
@@ -103,9 +101,6 @@ Ox.PATH = (function() {
             return src.replace(regexp, '');
         }
     }
-    }
-    // FIXME: fix path detection
-    return './source/';
 }());
 //@ Ox.MODE <s> Mode ('dev' or 'min')
 Ox.MODE = Ox.PATH.slice(0, -1).split('/').pop();

source/Ox/js/Core.js

@@ -2,7 +2,15 @@
 
 'use strict';
 
-import Ox from './Ox.Global.js';
+/*@
+Ox <f> The `Ox` object
+    See `Ox.wrap` for details.
+    (value) -> <o> wrapped value
+    value <*> Any value
+@*/
+this.Ox = function(value) {
+    return Ox.wrap(value);
+};
 
 /*@
 Ox.load <f> Loads OxJS and, optionally, one or more modules
@@ -68,17 +76,10 @@ Ox.load = function() {
         if (!length) {
             callback(true);
         } else {
-            let fn = Ox.noop
+            Ox.forEach(modules, function(options, module) {
-            if ('UI' in modules) {
+                Ox.getFile(
-                fn = function(callback) {
+                    Ox.PATH + module + '/' + module + '.js?' + Ox.VERSION,
-                  var path = Ox.PATH + 'UI/jquery/jquery-1.7.1.min.js?' + Ox.VERSION;
+                    function() {
-                  Ox.getFile(path, callback)
-                }
-            }
-            fn(function() {
-                Ox.forEach(modules, async function(options, module) {
-                    console.log("load module!", module, options)
-                    const obj = await import(Ox.PATH + module + '/' + module + '.js?' + Ox.VERSION);
                         Ox.load[module](options, function(success) {
                             succeeded += success;
                             if (++loaded == length) {
@@ -87,8 +88,9 @@ Ox.load = function() {
                                 });
                             }
                         });
+                    }
+                );
             });
-            })
         }
     });
 };
@@ -112,7 +114,7 @@ Ox.localStorage = function(namespace) {
     var localStorage;
     try {
         // this will fail if third party cookies/storage is not allowed
-        localStorage = globalThis.localStorage || {};
+        localStorage = window.localStorage || {};
         // FF 3.6 can't assign to or iterate over localStorage
         for (var key in localStorage) {}
         // In Safari (OS X or iOS) is in private browsing mode,
@@ -204,7 +206,7 @@ Ox.Log = (function() {
             args.unshift(
                 Ox.formatDate(date, '%H:%M:%S.') + (+date).toString().slice(-3)
             );
-            globalThis.console && globalThis.console.log && globalThis.console.log.apply(globalThis.console, args);
+            window.console && window.console.log && window.console.log.apply(window.console, args);
             ret = args.join(' ');
         }
         return ret;
@@ -266,7 +268,7 @@ Ox.print = function() {
     args.unshift(
         date.toString().split(' ')[4] + '.' + (+date).toString().slice(-3)
     );
-    globalThis.console && globalThis.console.log.apply(globalThis.console, args);
+    window.console && window.console.log.apply(window.console, args);
     return args.join(' ');
 };
 

source/Ox/js/DOM.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.$ <f> Generic HTML element, mimics jQuery
@@ -829,19 +828,12 @@ Ox.documentReady <function> Calls a callback function once the DOM is ready
 @*/
 Ox.documentReady = (function() {
     var callbacks = [];
-    if (typeof document === 'undefined') {
+    document.onreadystatechange = window.onload = function() {
-        return function(callback) {
-            callback();
-            return true;
-        }
-    }
-
-    document.onreadystatechange = globalThis.onload = function() {
         if (document.readyState == 'complete') {
             callbacks.forEach(function(callback) {
                 callback();
             });
-            document.onreadystatechange = globalThis.onload = null;
+            document.onreadystatechange = window.onload = null;
         }
     };
     return function(callback) {

source/Ox/js/Date.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 //@ Ox.getDate <f> Get the day of a date, optionally UTC
 // see Ox.setSeconds for source code

source/Ox/js/Encoding.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.encodeBase26 <b> Encode a number as bijective base26

source/Ox/js/Format.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.formatArea <f> Formats a number of meters as square meters or kilometers

source/Ox/js/Function.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.cache <f> Memoize a function

source/Ox/js/Geo.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 (function() {
 

source/Ox/js/HTML.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 (function() {
 

source/Ox/js/Hash.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.oshash <f> Calculates oshash for a given file or blob object. Async.

source/Ox/js/JavaScript.js

@@ -1,7 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
-
-var globalEval = eval;
 
 /*@
 Ox.doc <f> Generates documentation for annotated JavaScript
@@ -830,7 +827,7 @@ Ox.test = function(argument, callback) {
                     );
                 }
                 Ox.Log('TEST', statement);
-                actual = globalEval(statement);
+                actual = eval(statement);
                 if (!isAsync && test.expected) {
                     Ox.test.data[id].results.push({
                         actual: stringifyResult(actual),
@@ -839,7 +836,7 @@ Ox.test = function(argument, callback) {
                         section: item.section,
                         statement: statement,
                         passed: Ox.isEqual(
-                            actual, globalEval('(' + test.expected + ')')
+                            actual, eval('(' + test.expected + ')')
                         )
                     });
                 }

source/Ox/js/Locale.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 (function() {
 

source/Ox/js/Math.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.acosh <f> Inverse hyperbolic cosine

source/Ox/js/Object.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.extend <function> Extends an object with one or more other objects

source/Ox/js/Ox.Global.js

@@ -1,14 +0,0 @@
-'use strict';
-
-
-/*@
-Ox <f> The `Ox` object
-    See `Ox.wrap` for details.
-    (value) -> <o> wrapped value
-    value <*> Any value
-@*/
-export const Ox = function(value) {
-    return Ox.wrap(value)
-};
-
-export default Ox;

source/Ox/js/Polyfill.js

@@ -1,7 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
-
-var globalEval = eval;
 
 (function(window) {
 
@@ -212,7 +209,7 @@ var globalEval = eval;
         }
         return {
             parse: function parse(string) {
-                return globalEval('(' + string + ')');
+                return eval('(' + string + ')');
             },
             stringify: function stringify(value) {
                 var ret = 'null', type = Ox.typeOf(value);
@@ -399,7 +396,7 @@ var globalEval = eval;
     ].forEach(function(item) {
         var object = item[0], keys = item[1];
         keys.forEach(function(key) {
-            if (!(key in object)) {
+            if (!key in object) {
                 if (canDefineProperty) {
                     Object.defineProperty(object, key, {
                         configurable: true,
@@ -430,4 +427,4 @@ var globalEval = eval;
         }
     }
 
-}(globalThis));
+}(this));

source/Ox/js/RegExp.js

@@ -1,5 +1,3 @@
-import Ox from './Ox.Global.js';
-
 /*@
 Ox.escapeRegExp <f> Escapes a string for use in a regular expression
     (str) -> <r> Escaped string

source/Ox/js/Request.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.get <f> Get a remote resource
@@ -88,10 +87,6 @@ Ox.getAsync = function(urls, get, callback) {
 
 (function() {
 
-    if (typeof document == 'undefined') {
-        console.log("running in node, disable some things in Requets.js")
-        return
-    }
     var cache = {},
         head = document.head
             || document.getElementsByTagName('head')[0]

source/Ox/js/String.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.char <f> Alias for String.fromCharCode
@@ -266,21 +265,9 @@ Ox.parseURL <f> Takes a URL, returns its components
     '?a=0&b=1'
 @*/
 Ox.parseURL = (function() {
-    const keys = [
+    var a = document.createElement('a'),
-        'hash', 'host', 'hostname', 'origin',
+        keys = ['hash', 'host', 'hostname', 'origin',
-        'pathname', 'port', 'protocol', 'search'
+            'pathname', 'port', 'protocol', 'search'];
-    ];
-    if (typeof document == 'undefined') {
-        return function(string) {
-            const a = new URL(string);
-            var ret = {};
-            keys.forEach(function(key) {
-                ret[key] = a[key];
-            });
-            return ret;
-        }
-    } else {
-        var a = document.createElement('a');
     return function(string) {
         var ret = {};
         a.href = string;
@@ -289,7 +276,6 @@ Ox.parseURL = (function() {
         });
         return ret;
     };
-    }
 }());
 
 // FIXME: can we get rid of this?

source/Ox/js/Type.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.checkType <f> Throws a TypeError if a value is not of a given type
@@ -443,13 +442,11 @@ Ox.typeOf = function(value) {
 // Mobile Safari returns 'DOMWindow' for null and undefined
 // Firefox 30+ returns 'window' for window
 if (
-    (typeof document != 'undefined') && (
     Ox.typeOf((function() { return arguments; }())) != 'arguments'
     || Ox.typeOf(document.getElementsByTagName('a')) != 'nodelist'
     || Ox.typeOf(null) != 'null'
     || Ox.typeOf(window) != 'global'
     || Ox.typeOf() != 'undefined'
-    )
 ) {
     Ox.typeOf = function(value) {
         var type = Object.prototype.toString.call(

source/Ox/js/Video.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './Ox.Global.js';
 
 /*@
 Ox.getVideoFormat <f> Get supported video format

source/UI/UI.js

@@ -1,128 +1,7 @@
 'use strict';
 
-import Ox from './../Ox/js/Ox.Global.js';
+Ox.load.UI = function(options, callback) {
-Ox.UI = Ox.UI || {};
 
-import './js/Audio/AudioElement.js';
-import './js/Audio/AudioPlayer.js';
-import './js/Bar/Bar.js';
-import './js/Bar/Progressbar.js';
-import './js/Bar/Resizebar.js';
-import './js/Bar/Tabbar.js';
-import './js/Calendar/CalendarEditor.js';
-import './js/Calendar/Calendar.js';
-import './js/Code/DocPage.js';
-import './js/Code/DocPanel.js';
-import './js/Code/ExamplePage.js';
-import './js/Code/ExamplePanel.js';
-import './js/Code/SourceViewer.js';
-import './js/Code/SyntaxHighlighter.js';
-import './js/Core/API.js';
-import './js/Core/App.js';
-import './js/Core/Clipboard.js';
-import './js/Core/Container.js';
-import './js/Core/Cookies.js';
-import './js/Core/Element.js';
-import './js/Core/Event.js';
-import './js/Core/Focus.js';
-import './js/Core/Fullscreen.js';
-import './js/Core/GarbageCollection.js';
-import './js/Core/History.js';
-import './js/Core/LoadingIcon.js';
-import './js/Core/LoadingScreen.js';
-import './js/Core/Request.js';
-import './js/Core/Theme.js';
-import './js/Core/UI.js';
-import './js/Core/URL.js';
-import './js/Form/ArrayEditable.js';
-import './js/Form/ArrayInput.js';
-import './js/Form/ButtonGroup.js';
-import './js/Form/Button.js';
-import './js/Form/CheckboxGroup.js';
-import './js/Form/Checkbox.js';
-import './js/Form/ColorInput.js';
-import './js/Form/ColorPicker.js';
-import './js/Form/DateInput.js';
-import './js/Form/DateTimeInput.js';
-import './js/Form/EditableContent.js';
-import './js/Form/Editable.js';
-import './js/Form/FileButton.js';
-import './js/Form/FileInput.js';
-import './js/Form/Filter.js';
-import './js/Form/FormElementGroup.js';
-import './js/Form/FormItem.js';
-import './js/Form/Form.js';
-import './js/Form/FormPanel.js';
-import './js/Form/InputGroup.js';
-import './js/Form/Input.js';
-import './js/Form/InsertHTMLDialog.js';
-import './js/Form/Label.js';
-import './js/Form/ObjectArrayInput.js';
-import './js/Form/ObjectInput.js';
-import './js/Form/OptionGroup.js';
-import './js/Form/Picker.js';
-import './js/Form/PlaceInput.js';
-import './js/Form/PlacePicker.js';
-import './js/Form/Range.js';
-import './js/Form/SelectInput.js';
-import './js/Form/Select.js';
-import './js/Form/Spreadsheet.js';
-import './js/Form/TimeInput.js';
-import './js/Image/ImageElement.js';
-import './js/Image/ImageViewer.js';
-import './js/List/Chart.js';
-import './js/List/ColumnList.js';
-import './js/List/CustomList.js';
-import './js/List/IconItem.js';
-import './js/List/IconList.js';
-import './js/List/InfoList.js';
-import './js/List/ListItem.js';
-import './js/List/List.js';
-import './js/List/SortList.js';
-import './js/List/TableList.js';
-import './js/List/TreeList.js';
-import './js/Map/MapEditor.js';
-import './js/Map/MapImage.js';
-import './js/Map/Map.js';
-import './js/Map/MapMarkerImage.js';
-import './js/Map/MapMarker.js';
-import './js/Map/MapPlace.js';
-import './js/Map/MapRectangle.js';
-import './js/Map/MapRectangleMarker.js';
-import './js/Menu/MainMenu.js';
-import './js/Menu/MenuButton.js';
-import './js/Menu/MenuItem.js';
-import './js/Menu/Menu.js';
-import './js/Panel/CollapsePanel.js';
-import './js/Panel/SlidePanel.js';
-import './js/Panel/SplitPanel.js';
-import './js/Panel/TabPanel.js';
-import './js/Video/AnnotationFolder.js';
-import './js/Video/AnnotationPanel.js';
-import './js/Video/BlockVideoTimeline.js';
-import './js/Video/ClipPanel.js';
-import './js/Video/LargeVideoTimeline.js';
-import './js/Video/SmallVideoTimelineImage.js';
-import './js/Video/SmallVideoTimeline.js';
-import './js/Video/VideoAnnotationPanel.js';
-import './js/Video/VideoEditPanel.js';
-import './js/Video/VideoElement.js';
-import './js/Video/VideoPlayer.js';
-import './js/Video/VideoPlayerMenu.js';
-import './js/Video/VideoPlayerPanel.js';
-import './js/Video/VideoPreview.js';
-import './js/Video/VideoTimelinePanel.js';
-import './js/Video/VideoTimelinePlayer.js';
-import './js/Window/Dialog.js';
-import './js/Window/Layer.js';
-import './js/Window/SortDialog.js';
-import './js/Window/Tooltip.js';
-
-export const UI = Ox.UI;
-export default UI;
-
-if (typeof globalThis !== 'undefined') {
-    Ox.load.UI = function(options, callback) {
     options = Ox.extend({
         hideScreen: true,
         loadCSS: true,
@@ -190,6 +69,8 @@ if (typeof globalThis !== 'undefined') {
         }
     });
 
+    Ox.UI = {};
+
     Ox.UI.LoadingScreen = (function() {
 
         var $body = Ox.$('body'),
@@ -247,8 +128,7 @@ if (typeof globalThis !== 'undefined') {
                     .appendTo(div);
             });
             */
-                //var src = Ox.PATH + 'UI/themes/' + options.theme + '/svg/symbolLoading.svg'
+            var src = Ox.PATH + 'UI/themes/' + options.theme + '/svg/symbolLoading.svg'
-                var src = Ox.PATH + '../dev/UI/themes/' + options.theme + '/svg/symbolLoading.svg'
             Ox.getFile(src, function() {
                 $icon = Ox.$('<img>')
                     .attr({
@@ -369,7 +249,10 @@ if (typeof globalThis !== 'undefined') {
     loadUI();
 
     function loadUI() {
-            let path = Ox.PATH + 'UI/json/UI.json?' + Ox.VERSION;
+
+        var path = Ox.PATH + 'UI/jquery/jquery.js?' + Ox.VERSION;
+        Ox.getFile(path, function() {
+            path = Ox.PATH + 'UI/json/UI.json?' + Ox.VERSION;
             Ox.getJSON(path, function(data) {
                 var counter = 0, length;
                 if (!options.loadCSS) {
@@ -400,6 +283,8 @@ if (typeof globalThis !== 'undefined') {
                     }
                 });
             });
+        });
+
     }
 
     function initUI() {
@@ -417,5 +302,4 @@ if (typeof globalThis !== 'undefined') {
 
     }
 
-    };
+};
-}

source/UI/css/UI.css

@@ -1,7 +1,4 @@
-@import url("../themes/aqua/css/theme.css");
+$import
-@import url("../themes/oxdark/css/theme.css");
-@import url("../themes/oxlight/css/theme.css");
-@import url("../themes/oxmedium/css/theme.css");
 
 /*
 ================================================================================

source/UI/js/Audio/AudioElement.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.AudioElement <f> AudioElement Object

source/UI/js/Audio/AudioPlayer.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.AudioPlayer <f> Generic Audio Player

source/UI/js/Bar/Bar.js

@@ -1,6 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
-
 /*@
 Ox.Bar <f> Bar
     options <o> Options object

source/UI/js/Bar/Progressbar.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Progressbar <f> Progress Bar

source/UI/js/Bar/Resizebar.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 /*@
 Ox.Resizebar <f> Resizebar
     options <o> Options object

source/UI/js/Bar/Tabbar.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 /*@
 Ox.Tabbar <f> Tabbar
     options <o> Options object

source/UI/js/Calendar/Calendar.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Calendar <f> Basic calendar object

source/UI/js/Calendar/CalendarEditor.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.CalendarEditor <f> Calendar Editor

source/UI/js/Code/DocPage.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.DocPage <f> DocPage

source/UI/js/Code/DocPanel.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.DocPanel <f> Documentation Panel

source/UI/js/Code/ExamplePage.js

@@ -1,5 +1,4 @@
 'use strict'
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ExamplePage <f> Example Page

source/UI/js/Code/ExamplePanel.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ExamplePanel <f> Example Panel

source/UI/js/Code/SourceViewer.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.SourceViewer <f> Source Viewer

source/UI/js/Code/SyntaxHighlighter.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.SyntaxHighlighter <f> Syntax Highlighter

source/UI/js/Core/API.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.API <f> Remote API controller

source/UI/js/Core/App.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.App <f> Basic application instance that communicates with a JSON API
@@ -76,12 +75,12 @@ Ox.App = function(options) {
             screen: screen,
             time: (+new Date() - self.time) / 1000,
             window: {
-                innerHeight: globalThis.innerHeight,
+                innerHeight: window.innerHeight,
-                innerWidth: globalThis.innerWidth,
+                innerWidth: window.innerWidth,
-                outerHeight: globalThis.outerHeight,
+                outerHeight: window.outerHeight,
-                outerWidth: globalThis.outerWidth,
+                outerWidth: window.outerWidth,
-                screenLeft: globalThis.screenLeft,
+                screenLeft: window.screenLeft,
-                screenTop: globalThis.screenTop
+                screenTop: window.screenTop
             }
         };
     }

source/UI/js/Core/Clipboard.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Clipboard <o> Basic clipboard handler

source/UI/js/Core/Container.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 // fixme: wouldn't it be better to let the elements be,
 // rather then $element, $content, and potentially others,

source/UI/js/Core/Cookies.js

@@ -1,5 +1,3 @@
-import Ox from './../../../Ox/js/Ox.Global.js';
-
 Ox.Cookies = function() {
     var name, value, cookies;
     if (arguments.length == 1) {

source/UI/js/Core/Element.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 (function(_) {
     var noTooltipEvents = {};

source/UI/js/Core/Event.js

@@ -1,5 +1,3 @@
-import Ox from './../../../Ox/js/Ox.Global.js';
-
 (function() {
 
     var chars = {

source/UI/js/Core/Focus.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Focus <o> Basic focus controller

source/UI/js/Core/Fullscreen.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Fullscreen <o> Fullscreen controller

source/UI/js/Core/GarbageCollection.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.GarbageCollection <f> GarbageCollection

source/UI/js/Core/History.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 Ox.History = function(options) {
 

source/UI/js/Core/LoadingIcon.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.LoadingIcon <f> Loading Icon Element

source/UI/js/Core/LoadingScreen.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.LoadingScreen <f> Simple loading screen

source/UI/js/Core/Request.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Request <o> Basic request controller

source/UI/js/Core/Theme.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Theme <f> get/set theme

source/UI/js/Core/UI.js

@@ -1,8 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
-
-Ox.UI = Ox.UI || {};
-console.log("Ox", Ox, Ox.UI)
 
 Ox.documentReady(function() {
     // FIXME: use Ox.$foo everywhere!
@@ -20,11 +16,10 @@ Ox.documentReady(function() {
 Ox.$elements = {};
 
 //@ Ox.UI.DIMENSIONS <o> Names of horizontal and vertical dimensions
-Ox.UI.DIMENSIONS = {
+Ox.DIMENSIONS = Ox.UI.DIMENSIONS = {
     horizontal: ['width', 'height'],
     vertical: ['height', 'width']
 };
-Ox.DIMENSIONS = Ox.UI.DIMENSIONS;
 
 //@ Ox.UI.EDGES <o> Names of horizontal and vertical edges
 Ox.EDGES = Ox.UI.EDGES = {

source/UI/js/Core/URL.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.URL <f> URL controller

source/UI/js/Form/ArrayEditable.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ArrayEditable <f> Array Editable

source/UI/js/Form/ArrayInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ArrayInput <f> Array input

source/UI/js/Form/Button.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Button <f> Button Object

source/UI/js/Form/ButtonGroup.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ButtonGroup <f> ButtonGroup Object

source/UI/js/Form/Checkbox.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Checkbox <f> Checkbox Element

source/UI/js/Form/CheckboxGroup.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.CheckboxGroup <f> CheckboxGroup Object

source/UI/js/Form/ColorInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ColorInput <f> ColorInput Element

source/UI/js/Form/ColorPicker.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ColorPicker <f> ColorPicker Element

source/UI/js/Form/DateInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.DateInput <f> DateInput Element

source/UI/js/Form/DateTimeInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.DateTimeInput <f> DateTimeInput Element

source/UI/js/Form/Editable.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Editable <f> Editable element

source/UI/js/Form/EditableContent.js

@@ -1,5 +1,3 @@
-import Ox from './../../../Ox/js/Ox.Global.js';
-
 Ox.EditableContent = function(options, self) {
 
     self = self || {};

source/UI/js/Form/FileButton.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.FileButton <f> File Button

source/UI/js/Form/FileInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.FileInput <f> File Input

source/UI/js/Form/Filter.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Filter <f> Filter Object

source/UI/js/Form/Form.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Form <f> Form Object

source/UI/js/Form/FormElementGroup.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.FormElementGroup <f> FormElementGroup Element

source/UI/js/Form/FormItem.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.FormItem <f> FormItem Element, wraps form element with an error message

source/UI/js/Form/FormPanel.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.FormPanel <f> Form Panel

source/UI/js/Form/Input.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Input <f> Input Element

source/UI/js/Form/InputGroup.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.InputGroup <f> InputGroup Object

source/UI/js/Form/InsertHTMLDialog.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.InsertHTMLDialog <f> Insert HTML Dialog

source/UI/js/Form/Label.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Label <f> Label element

source/UI/js/Form/ObjectArrayInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ObjectArrayInput <f> Object Array Input

source/UI/js/Form/ObjectInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.ObjectInput <f> Object Input

source/UI/js/Form/OptionGroup.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.OptionGroup <f> OptionGroup

source/UI/js/Form/Picker.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Picker <f> Picker Object

source/UI/js/Form/PlaceInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.PlaceInput <f> PlaceInput Object

source/UI/js/Form/PlacePicker.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.PlacePicker <f> PlacePicker Object

source/UI/js/Form/Range.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Range <f> Range Object

source/UI/js/Form/Select.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Select <f> Select Object

source/UI/js/Form/SelectInput.js

@@ -1,6 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
-
 //FIXME: does not work without options
 /*@
 Ox.SelectInput <f> Select Input

source/UI/js/Form/Spreadsheet.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.Spreadsheet <f> Spreadsheet

source/UI/js/Form/TimeInput.js

@@ -1,5 +1,4 @@
 'use strict';
-import Ox from './../../../Ox/js/Ox.Global.js';
 
 /*@
 Ox.TimeInput <f> TimeInput Object