diff --git a/Account/AccountManager.js b/Account/AccountManager.js index 3740d53..598bd9c 100644 --- a/Account/AccountManager.js +++ b/Account/AccountManager.js @@ -9,14 +9,15 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.Account'); + /** * @constructor * * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.AccountManager = function () + jsOMS.Account.AccountManager = function () { this.accounts = []; }; @@ -31,7 +32,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.AccountManager.prototype.add = function (account) + jsOMS.Account.AccountManager.prototype.add = function (account) { this.accounts[account.getId()] = account; }; @@ -46,7 +47,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.AccountManager.prototype.remove = function (id) + jsOMS.Account.AccountManager.prototype.remove = function (id) { if (typeof this.accounts[id] !== 'undefined') { delete this.accounts[id]; @@ -69,7 +70,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.AccountManager.prototype.get = function (id) + jsOMS.Account.AccountManager.prototype.get = function (id) { if (this.accounts[id]) { return this.accounts[id]; diff --git a/Account/AccountType.enum.js b/Account/AccountType.enum.js index cfa7cea..8033d2a 100644 --- a/Account/AccountType.enum.js +++ b/Account/AccountType.enum.js @@ -9,7 +9,9 @@ */ (function (jsOMS, undefined) { - jsOMS.Account.EnumAccountType = Object.freeze({ + jsOMS.Autoloader.defineNamespace('jsOMS.Account'); + + jsOMS.Account.AccountType = Object.freeze({ USER: 0, GROUP: 1 }); diff --git a/Asset/AssetManager.js b/Asset/AssetManager.js index f91abd8..dfd598e 100644 --- a/Asset/AssetManager.js +++ b/Asset/AssetManager.js @@ -9,7 +9,8 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.Asset'); + /** * @constructor * diff --git a/Auth/Auth.js b/Auth/Auth.js index f7bd333..7fca725 100644 --- a/Auth/Auth.js +++ b/Auth/Auth.js @@ -9,6 +9,7 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Auth'); /** * @constructor diff --git a/Autoloader.js b/Autoloader.js new file mode 100644 index 0000000..166824b --- /dev/null +++ b/Autoloader.js @@ -0,0 +1,60 @@ +(function (jsOMS, undefined) { + jsOMS.Autoloader = {}; + jsOMS.Autoloader.loaded = []; + jsOMS.Autoloader.namespaced = []; + + jsOMS.Autoloader.defineNamespace = function(namespace) + { + if(jsOMS.Autoloader.namespaced.indexOf(namespace) === -1) { + let paths = namespace.split('.'); + paths.splice(0, 1); + + let length = paths.length, + current = jsOMS; + + for(let i = 0; i < length; i++) { + if(typeof current[paths[i]] === 'undefined') { + current[paths[i]] = {}; + } + + current = current[paths[i]]; + } + + jsOMS.Autoloader.namespaced.push(namespace); + } + }; + + jsOMS.Autoloader.initPreloaded = function() + { + let scripts = document.getElementsByTagName('script'), + length = scripts.length; + + for(let i = 0; i < length; i++) { + scripts[i].src.replace(URL + '/', ''); + + if(jsOMS.Autoloader.loaded.indexOf(scripts[i].src) === -1) { + jsOMS.Autoloader.loaded.push(scripts[i].src); + } + } + }; + + jsOMS.Autoloader.setPreloaded = function(file) + { + if(jsOMS.Autoloader.loaded.indexOf(file) === -1) { + jsOMS.Autoloader.loaded.push(file); + } + }; + + jsOMS.Autoloader.include = function(file, callback) + { + let length = file.length; + + for(let i = 0; i < length; i++) { + if(jsOMS.Autoloader.loaded.indexOf(file) === -1) { + // todo: implement asset loading and pass callback + + jsOMS.Autoloader.loaded.push(file); + } + } + }; +}(window.jsOMS = window.jsOMS || {})); \ No newline at end of file diff --git a/Config/Options.js b/Config/Options.js index 0b1f1e2..09fdb5a 100644 --- a/Config/Options.js +++ b/Config/Options.js @@ -9,6 +9,7 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Config'); /** * @constructor diff --git a/DataStorage/CacheManager.js b/DataStorage/CacheManager.js index a8c888e..3667e66 100644 --- a/DataStorage/CacheManager.js +++ b/DataStorage/CacheManager.js @@ -1,6 +1,8 @@ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.DataStorage'); + // TODO: create comments - jsOMS.CacheManager = function () + jsOMS.DataStorage.CacheManager = function () { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/DataStorage/CookieJar.js b/DataStorage/CookieJar.js index 809693e..53f0026 100644 --- a/DataStorage/CookieJar.js +++ b/DataStorage/CookieJar.js @@ -9,7 +9,8 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.DataStorage'); + /** * @constructor * diff --git a/DataStorage/LocalStorage.js b/DataStorage/LocalStorage.js index ff8dc1b..2973ae5 100644 --- a/DataStorage/LocalStorage.js +++ b/DataStorage/LocalStorage.js @@ -9,7 +9,8 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.DataStorage'); + /** * @constructor * diff --git a/DataStorage/StorageManager.js b/DataStorage/StorageManager.js index 6354a72..2b87c28 100644 --- a/DataStorage/StorageManager.js +++ b/DataStorage/StorageManager.js @@ -1,5 +1,7 @@ (function (jsOMS, undefined) { - jsOMS.StorageManager = function () + jsOMS.Autoloader.defineNamespace('jsOMS.DataStorage'); + + jsOMS.DataStorage.StorageManager = function () { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/Dispatcher/Dispatcher.js b/Dispatcher/Dispatcher.js index 7bb5da6..d9256b7 100644 --- a/Dispatcher/Dispatcher.js +++ b/Dispatcher/Dispatcher.js @@ -1,5 +1,7 @@ (function (jsOMS, undefined) { - jsOMS.Dispatcher = function () + jsOMS.Autoloader.defineNamespace('jsOMS.Dispatcher'); + + jsOMS.Dispatcher.Dispatcher = function () { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/Event/EventManager.js b/Event/EventManager.js index 8a1617c..6283ac7 100644 --- a/Event/EventManager.js +++ b/Event/EventManager.js @@ -1,4 +1,6 @@ (function (jsOMS, undefined) { - jsOMS.EventManager = function () { + jsOMS.Autoloader.defineNamespace('jsOMS.Event'); + + jsOMS.Event.EventManager = function () { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/Log/LogLevel.enum.js b/Log/LogLevel.enum.js index 87adb41..06ca393 100644 --- a/Log/LogLevel.enum.js +++ b/Log/LogLevel.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Log'); + jsOMS.Log.LogLevel = Object.freeze({ EMERGENCY: 'normal', ALERT: 'normal', diff --git a/Log/Logger.js b/Log/Logger.js index 21213aa..6712231 100644 --- a/Log/Logger.js +++ b/Log/Logger.js @@ -10,6 +10,7 @@ (function (jsOMS, undefined) { "use strict"; + jsOMS.Autoloader.defineNamespace('jsOMS.Log'); /** * @constructor @@ -17,7 +18,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.Logger = function (verbose, ui, remote) + jsOMS.Log.Logger = function (verbose, ui, remote) { this.verbose = typeof verbose !== 'undefined' ? verbose : true; this.ui = typeof ui !== 'undefined' ? ui : true; @@ -55,7 +56,7 @@ context = this.createContext(message, context, level); if(this.verbose) { - console.log(this.interpolate(message, context, level))); + console.log(this.interpolate(message, context, level)); } if(this.ui) { @@ -63,7 +64,7 @@ } if(this.remote) { - let request = new jsOMS.Message.Request(), + let request = new jsOMS.Message.Request(); request.setData(context); request.setType(jsOMS.Message.Response.ResponseType.JSON); request.setUri('/{/lang}/api/log'); diff --git a/Message/Request/BrowserType.enum.js b/Message/Request/BrowserType.enum.js index 6ea33d0..eb2ef07 100644 --- a/Message/Request/BrowserType.enum.js +++ b/Message/Request/BrowserType.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + jsOMS.Message.Request.BrowserType = Object.freeze({ OPERA: 'opera', FIREFOX: 'firefox', diff --git a/Message/Request/OSType.enum.js b/Message/Request/OSType.enum.js index adcb735..06456b7 100644 --- a/Message/Request/OSType.enum.js +++ b/Message/Request/OSType.enum.js @@ -9,29 +9,31 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + jsOMS.Message.Request.OSType = Object.freeze({ - WINDOWS_81: 'windows nt 6.3'; /* Windows 8.1 */ - WINDOWS_8: 'windows nt 6.2'; /* Windows 8 */ - WINDOWS_7: 'windows nt 6.1'; /* Windows 7 */ - WINDOWS_VISTA: 'windows nt 6.0'; /* Windows Vista */ - WINDOWS_SERVER: 'windows nt 5.2'; /* Windows Server 2003/XP x64 */ - WINDOWS_XP: 'windows nt 5.1'; /* Windows XP */ - WINDOWS_XP_2: 'windows xp'; /* Windows XP */ - WINDOWS_2000: 'windows nt 5.0'; /* Windows 2000 */ - WINDOWS_ME: 'windows me'; /* Windows ME */ - WINDOWS_98: 'win98'; /* Windows 98 */ - WINDOWS_95: 'win95'; /* Windows 95 */ - WINDOWS_311: 'win16'; /* Windows 3.11 */ - MAC_OS_X: 'macintosh'; /* Mac OS X */ - MAC_OS_X_2: 'mac os x'; /* Mac OS X */ - MAC_OS_9: 'mac_powerpc'; /* Mac OS 9 */ - LINUX : 'linux'; /* Linux */ - UBUNTU: 'ubuntu'; /* Ubuntu */ - IPHONE: 'iphone'; /* IPhone */ - IPOD: 'ipod'; /* IPod */ - IPAD: 'ipad'; /* IPad */ - ANDROID: 'android'; /* Android */ - BLACKBERRY: 'blackberry'; /* Blackberry */ - MOBILE: 'webos'; /* Mobile */ + WINDOWS_81: 'windows nt 6.3', /* Windows 8.1 */ + WINDOWS_8: 'windows nt 6.2', /* Windows 8 */ + WINDOWS_7: 'windows nt 6.1', /* Windows 7 */ + WINDOWS_VISTA: 'windows nt 6.0', /* Windows Vista */ + WINDOWS_SERVER: 'windows nt 5.2', /* Windows Server 2003/XP x64 */ + WINDOWS_XP: 'windows nt 5.1', /* Windows XP */ + WINDOWS_XP_2: 'windows xp', /* Windows XP */ + WINDOWS_2000: 'windows nt 5.0', /* Windows 2000 */ + WINDOWS_ME: 'windows me', /* Windows ME */ + WINDOWS_98: 'win98', /* Windows 98 */ + WINDOWS_95: 'win95', /* Windows 95 */ + WINDOWS_311: 'win16', /* Windows 3.11 */ + MAC_OS_X: 'macintosh', /* Mac OS X */ + MAC_OS_X_2: 'mac os x', /* Mac OS X */ + MAC_OS_9: 'mac_powerpc', /* Mac OS 9 */ + LINUX : 'linux', /* Linux */ + UBUNTU: 'ubuntu', /* Ubuntu */ + IPHONE: 'iphone', /* IPhone */ + IPOD: 'ipod', /* IPod */ + IPAD: 'ipad', /* IPad */ + ANDROID: 'android', /* Android */ + BLACKBERRY: 'blackberry', /* Blackberry */ + MOBILE: 'webos' /* Mobile */ }); }(window.jsOMS = window.jsOMS || {})); diff --git a/Message/Request/Request.js b/Message/Request/Request.js index 1e36dd0..946ba41 100644 --- a/Message/Request/Request.js +++ b/Message/Request/Request.js @@ -9,6 +9,7 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); /** * @constructor @@ -37,7 +38,7 @@ } else if(typeof InstallTrigger !== 'undefined') { return jsOMS.EnumBrowser.FIREFOX; } else if(Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0) { - return return jsOMS.EnumBrowser.SAFARI; + return jsOMS.EnumBrowser.SAFARI; } else if(/*@cc_on!@*/false || !!document.documentMode) { return jsOMS.EnumBrowser.IE; } else if(!isIE && !!window.StyleMedia) { diff --git a/Message/Request/RequestData.enum.js b/Message/Request/RequestData.enum.js index b866749..397db81 100644 --- a/Message/Request/RequestData.enum.js +++ b/Message/Request/RequestData.enum.js @@ -9,7 +9,9 @@ */ (function (jsOMS, undefined) { - jsOMS.EnumLinkRequestData = Object.freeze({ + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + + jsOMS.Message.RequestLinkRequestData = Object.freeze({ NORMAL: 'normal', OBJECT: 'object' }); diff --git a/Message/Request/RequestManager.js b/Message/Request/RequestManager.js index 809c06a..7945719 100644 --- a/Message/Request/RequestManager.js +++ b/Message/Request/RequestManager.js @@ -11,14 +11,15 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + /** * @constructor * * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.Message.RequestManager = function () + jsOMS.Message.Request.RequestManager = function () { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/Message/Request/RequestMethod.enum.js b/Message/Request/RequestMethod.enum.js index 51c07a5..6b22636 100644 --- a/Message/Request/RequestMethod.enum.js +++ b/Message/Request/RequestMethod.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + jsOMS.Message.Request.RequestMethod = Object.freeze({ POST: 'POST', GET: 'GET', diff --git a/Message/Request/RequestType.enum.js b/Message/Request/RequestType.enum.js index 81ab583..cdfb09c 100644 --- a/Message/Request/RequestType.enum.js +++ b/Message/Request/RequestType.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); + jsOMS.Message.Request.RequestType = Object.freeze({ JSON: 'json', RAW: 'raw' diff --git a/Message/Response/ResponseManager.js b/Message/Response/ResponseManager.js index d11dfe4..c093761 100644 --- a/Message/Response/ResponseManager.js +++ b/Message/Response/ResponseManager.js @@ -11,6 +11,7 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Response'); /** * @constructor diff --git a/Message/Response/ResponseResultType.enum.js b/Message/Response/ResponseResultType.enum.js index 59bf343..d0d1ef3 100644 --- a/Message/Response/ResponseResultType.enum.js +++ b/Message/Response/ResponseResultType.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Response'); + jsOMS.Message.Response.ResponseResultType = Object.freeze({ MULTI: 0, MESSAGE: 1, diff --git a/Message/Response/ResponseType.enum.js b/Message/Response/ResponseType.enum.js index 9c124e2..97c0678 100644 --- a/Message/Response/ResponseType.enum.js +++ b/Message/Response/ResponseType.enum.js @@ -9,6 +9,8 @@ */ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Response'); + jsOMS.Message.Response.ResponseType = Object.freeze({ TEXT: 'text', JSON: 'json', diff --git a/Message/Response/Resposne.js b/Message/Response/Resposne.js index 8e89c0d..7fa8dbd 100644 --- a/Message/Response/Resposne.js +++ b/Message/Response/Resposne.js @@ -1,4 +1,6 @@ (function (uriFactory, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Message.Response'); + jsOMS.Message.Response.Response = function (data) { this.responses = data; }; diff --git a/Module/ModuleFactory.js b/Module/ModuleFactory.js index b980e5e..85e0a3a 100644 --- a/Module/ModuleFactory.js +++ b/Module/ModuleFactory.js @@ -9,7 +9,8 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.Module'); + /** * @constructor * diff --git a/Module/ModuleManager.js b/Module/ModuleManager.js index d7ca131..7064c22 100644 --- a/Module/ModuleManager.js +++ b/Module/ModuleManager.js @@ -9,8 +9,7 @@ */ (function (jsOMS, undefined) { - jsOMS.Modules = {}; - jsOMS.Modules.Models = {}; + jsOMS.Autoloader.defineNamespace('jsOMS.Module'); /** * @constructor diff --git a/Route/Route.js b/Route/Route.js index a52310a..4839840 100644 --- a/Route/Route.js +++ b/Route/Route.js @@ -1,6 +1,8 @@ (function (jsOMS, undefined) { + jsOMS.Autoloader.defineNamespace('jsOMS.Route'); + // TODO: create comments - jsOMS.Route = function () + jsOMS.Route.Route = function () { this.routes = null; }; diff --git a/UI/FormManager.js b/UI/FormManager.js index d876a2c..a6d1ead 100644 --- a/UI/FormManager.js +++ b/UI/FormManager.js @@ -9,15 +9,15 @@ */ (function (jsOMS, undefined) { - "use strict"; - + jsOMS.Autoloader.defineNamespace('jsOMS.UI'); + /** * @constructor * * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.UI.FormManager = function (app) + jsOMS.UI.FormManager = function(app) { this.app = app; this.forms = {}; diff --git a/UI/Input.js b/UI/Input.js index 3cd7573..9b26426 100644 --- a/UI/Input.js +++ b/UI/Input.js @@ -10,6 +10,7 @@ (function (jsOMS, undefined) { "use strict"; + jsOMS.Autoloader.defineNamespace('jsOMS.UI'); /** * @constructor diff --git a/UI/Input/InputManager.js b/UI/Input/InputManager.js index 7b2b9ab..1e82664 100644 --- a/UI/Input/InputManager.js +++ b/UI/Input/InputManager.js @@ -1,15 +1,13 @@ (function (jsOMS, undefined) { jsOMS.Autoloader.defineNamespace('jsOMS.UI.Input'); - jsOMS.Autoloader.include(['jsOMS/UI/Input/Keyboard/KeyBoardManager.js'], function() { jsOMS.UI.Input.InputManager = function () { - this.keyBoardManager = new jsOMS.UI.Input.Keyboard.KeyBoardManager(); + this.keyBoardManager = new jsOMS.UI.Input.Keyboard.KeyboardManager(); }; jsOMS.UI.Input.InputManager.prototype.getKeyboardManager = function() { return this.keyBoardManager; }; - }); }(window.jsOMS = window.jsOMS || {})); diff --git a/UI/Input/Keyboard/KeyboardManager.js b/UI/Input/Keyboard/KeyboardManager.js index c3b5997..366475c 100644 --- a/UI/Input/Keyboard/KeyboardManager.js +++ b/UI/Input/Keyboard/KeyboardManager.js @@ -1,9 +1,11 @@ (function (jsOMS, undefined) { - jsOMS.UI.Input.KeyboardManager = function () + jsOMS.Autoloader.defineNamespace('jsOMS.UI.Input.Keyboard'); + + jsOMS.UI.Input.Keyboard.KeyboardManager = function () { }; - jsOMS.UI.Input.KeyboardManager.prototype.bind = function (element, keys, callback) + jsOMS.UI.Input.Keyboard.KeyboardManager.prototype.bind = function (element, keys, callback) { element.addEventListener('keyup', function keyBind(event) { if(event.keyCode === keys.keyCode) { @@ -13,7 +15,7 @@ }; - jsOMS.UI.Input.KeyboardManager.prototype.unbind = function (element) + jsOMS.UI.Input.Keyboard.KeyboardManager.prototype.unbind = function (element) { element.removeEventListener('keyup', keyBind, false); }; diff --git a/UI/TabManager.js b/UI/TabManager.js index e988670..8e45cfd 100644 --- a/UI/TabManager.js +++ b/UI/TabManager.js @@ -9,14 +9,15 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.UI'); + /** * @constructor * * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TabManager = function (responseManager) + jsOMS.UI.TabManager = function (responseManager) { this.responseManager = responseManager; }; @@ -31,7 +32,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TabManager.prototype.bind = function (id) + jsOMS.UI.TabManager.prototype.bind = function (id) { if (typeof id !== 'undefined') { this.bindElement(document.getElementById(id)); @@ -54,7 +55,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TabManager.prototype.bindElement = function (e) + jsOMS.UI.TabManager.prototype.bindElement = function (e) { var nodes = e.querySelectorAll('.tab-links a'); diff --git a/UI/TableManager.js b/UI/TableManager.js index 07a9873..d16f544 100644 --- a/UI/TableManager.js +++ b/UI/TableManager.js @@ -9,14 +9,15 @@ */ (function (jsOMS, undefined) { - + jsOMS.Autoloader.defineNamespace('jsOMS.UI'); + /** * @constructor * * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TableManager = function (responseManager) + jsOMS.UI.TableManager = function (responseManager) { this.responseManager = responseManager; }; @@ -31,7 +32,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TableManager.prototype.bind = function (id) + jsOMS.UI.TableManager.prototype.bind = function (id) { if (typeof id !== 'undefined') { this.bindElement(document.getElementById(id)); @@ -54,7 +55,7 @@ * @since 1.0.0 * @author Dennis Eichhorn */ - jsOMS.TableManager.prototype.bindElement = function (e) + jsOMS.UI.TableManager.prototype.bindElement = function (e) { }; }(window.jsOMS = window.jsOMS || {})); diff --git a/UI/UIManager.js b/UI/UIManager.js index 186c42c..3d65cef 100644 --- a/UI/UIManager.js +++ b/UI/UIManager.js @@ -9,8 +9,8 @@ */ (function (jsOMS, undefined) { - jsOMS.UI = {}; - + jsOMS.Autoloader.defineNamespace('jsOMS.UI'); + /** * @constructor * @@ -20,9 +20,9 @@ jsOMS.UI.UIManager = function (app) { this.app = app; - this.formManager = new jsOMS.FormManager(this.app); - this.tabManager = new jsOMS.TabManager(this.app.responseManager); - this.tableManager = new jsOMS.TableManager(this.app.responseManager); + this.formManager = new jsOMS.UI.FormManager(this.app); + this.tabManager = new jsOMS.UI.TabManager(this.app.responseManager); + this.tableManager = new jsOMS.UI.TableManager(this.app.responseManager); }; /** diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js index e6c4aca..f7252d4 100644 --- a/Uri/UriFactory.js +++ b/Uri/UriFactory.js @@ -1,6 +1,5 @@ (function (uriFactory, undefined) { - jsOMS.Uri.UriFactory = {}; - jsOMS.Uri.UriFactory.uri = {}; + jsOMS.Autoloader.defineNamespace('jsOMS.Uri.UriFactory'); jsOMS.Uri.UriFactory.parseUrl = function (str, component) { @@ -89,7 +88,7 @@ let current = jsOMS.Uri.UriFactory.parseUrl(window.location.href); // match(new RegExp("\{[#\?\.a-zA-Z0-9]*\}", "gi")); - return uri.replace('\{[\/#\?@\.\$][a-zA-Z0-9]*\}' function(match) { + return uri.replace('\{[\/#\?@\.\$][a-zA-Z0-9]*\}', function(match) { match = substr(match[0], 1, match[0].length - 2); if(toMatch.hasProperty(match)) { diff --git a/Views/FormView.js b/Views/FormView.js index 1cda58b..dd7fb47 100644 --- a/Views/FormView.js +++ b/Views/FormView.js @@ -1,5 +1,6 @@ (function (jsOMS, undefined) { "use strict"; + jsOMS.Autoloader.defineNamespace('jsOMS.Views'); jsOMS.Views.FormView = function (id) { this.id = id;