',s=1,l=1;for(var d in o)if(o.hasOwnProperty(d)&&"object"!=typeof o[d]){var c;c="UI"==n.toUpperCase()?{selectUIBlock:s,selectUISubblock:l}:{selectSEBlock:s,selectSESubblock:l};var u="linkActive";s==t&&l==a&&(u="selected"),i+='
"},cMirror:function(e){CodeMirror.fromTextArea(document.getElementById(e),{lineNumbers:!0,indentUnit:4,indentWithTabs:!0,theme:"lesser-dark"})}};return{addHelpers:function(){NanoTemplate.addHelpers(e)},removeHelpers:function(){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.removeHelper(t)}}}(),NanoStateDefaultClass.inheritsFrom(NanoStateClass);var NanoStateDefault=new NanoStateDefaultClass;NanoStateClass.prototype.key=null,NanoStateClass.prototype.layoutRendered=!1,NanoStateClass.prototype.contentRendered=!1,NanoStateClass.prototype.mapInitialised=!1,NanoStateClass.prototype.isCurrent=function(){return NanoStateManager.getCurrentState()==this},NanoStateClass.prototype.onAdd=function(e){NanoBaseCallbacks.addCallbacks(),NanoBaseHelpers.addHelpers()},NanoStateClass.prototype.onRemove=function(e){NanoBaseCallbacks.removeCallbacks(),NanoBaseHelpers.removeHelpers()},NanoStateClass.prototype.onBeforeUpdate=function(e){return e=NanoStateManager.executeBeforeUpdateCallbacks(e)},NanoStateClass.prototype.onUpdate=function(e){try{(!this.layoutRendered||e.config.hasOwnProperty("autoUpdateLayout")&&e.config.autoUpdateLayout)&&($("#uiLayout").html(NanoTemplate.parse("layout",e)),this.layoutRendered=!0),(!this.contentRendered||e.config.hasOwnProperty("autoUpdateContent")&&e.config.autoUpdateContent)&&($("#uiContent").html(NanoTemplate.parse("main",e)),this.contentRendered=!0),NanoTemplate.templateExists("mapContent")&&(this.mapInitialised||($("#uiMap").draggable(),$("#uiMapTooltip").off("click").on("click",function(e){e.preventDefault(),$(this).fadeOut(400)}),this.mapInitialised=!0),$("#uiMapContent").html(NanoTemplate.parse("mapContent",e)),e.config.hasOwnProperty("showMap")&&e.config.showMap?($("#uiContent").addClass("hidden"),$("#uiMapWrapper").removeClass("hidden")):($("#uiMapWrapper").addClass("hidden"),$("#uiContent").removeClass("hidden"))),NanoTemplate.templateExists("mapHeader")&&$("#uiMapHeader").html(NanoTemplate.parse("mapHeader",e)),NanoTemplate.templateExists("mapFooter")&&$("#uiMapFooter").html(NanoTemplate.parse("mapFooter",e))}catch(t){return void reportError("ERROR: An error occurred while rendering the UI: "+t.message)}},NanoStateClass.prototype.onAfterUpdate=function(e){NanoStateManager.executeAfterUpdateCallbacks(e)},NanoStateClass.prototype.alertText=function(e){alert(e)};var NanoTemplate=function(){var e={},t={},a={},r={},n=function(){e=$("body").data("templateData"),null==e&&reportError("Error: Template data did not load correctly."),o()},o=function(){var t=Object.size(e);if(!t)return void $(document).trigger("templatesLoaded");for(var a in e)if(e.hasOwnProperty(a))return void $.when($.ajax({url:e[a],cache:!1,dataType:"text"})).done(function(t){t+='';try{NanoTemplate.addTemplate(a,t)}catch(r){return void reportError("ERROR: An error occurred while loading the UI: "+r.message)}delete e[a],o()}).fail(function(){reportError("ERROR: Loading template "+a+"("+e[a]+") failed!")})},i=function(){for(var e in t)try{a[e]=doT.template(t[e],null,t)}catch(r){reportError(r.message)}};return{init:function(){n()},addTemplate:function(e,a){t[e]=a},templateExists:function(e){return t.hasOwnProperty(e)},parse:function(e,n){if(!a.hasOwnProperty(e)||!a[e]){if(!t.hasOwnProperty(e))return reportError('ERROR: Template "'+e+'" does not exist in _compiledTemplates!'),"Template error (does not exist)
";i()}return"function"!=typeof a[e]?(reportError(a[e]),reportError('ERROR: Template "'+e+'" failed to compile!'),"Template error (failed to compile)
"):a[e].call(this,n.data,n.config,r)},addHelper:function(e,t){return jQuery.isFunction(t)?void(r[e]=t):void reportError("NanoTemplate.addHelper failed to add "+e+" as it is not a function.")},addHelpers:function(e){for(var t in e)e.hasOwnProperty(t)&&NanoTemplate.addHelper(t,e[t])},removeHelper:function(e){helpers.hasOwnProperty(e)&&delete r[e]}}}();
\ No newline at end of file
diff --git a/nano/package.json b/nano/package.json
index 5230b30eb14..5bceb412fae 100644
--- a/nano/package.json
+++ b/nano/package.json
@@ -14,12 +14,13 @@
"gulp-if": "^2.0.0",
"gulp-less": "^3.0.5",
"gulp-load-plugins": "^1.1.0",
+ "gulp-order": "^1.1.1",
"gulp-postcss": "^6.0.1",
"gulp-replace": "^0.5.4",
"gulp-uglify": "^1.5.1",
"gulp-util": "^3.0.7",
- "merge-stream": "^1.0.0",
"main-bower-files": "^2.9.0",
+ "merge-stream": "^1.0.0",
"pleeease-filters": "^2.0.0",
"postcss-color-rgba-fallback": "git+https://github.com/postcss/postcss-color-rgba-fallback",
"postcss-filter-gradient": "^0.2.1",
diff --git a/nano/reload.bat b/nano/reload.bat
new file mode 100644
index 00000000000..a330006173f
--- /dev/null
+++ b/nano/reload.bat
@@ -0,0 +1,9 @@
+@echo off
+
+for /f "tokens=3* delims= " %%a in (
+ 'reg query "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "Personal"'
+) do (
+ set documents=%%a
+)
+
+copy assets\* "%documents%\BYOND\cache" /y
diff --git a/nano/scripts/libraries/3_doT.js b/nano/scripts/libraries/doT.js
similarity index 100%
rename from nano/scripts/libraries/3_doT.js
rename to nano/scripts/libraries/doT.js
diff --git a/nano/scripts/libraries/1_jquery-ui.js b/nano/scripts/libraries/jquery-ui.js
similarity index 100%
rename from nano/scripts/libraries/1_jquery-ui.js
rename to nano/scripts/libraries/jquery-ui.js
diff --git a/nano/scripts/libraries/0_jquery.js b/nano/scripts/libraries/jquery.js
similarity index 100%
rename from nano/scripts/libraries/0_jquery.js
rename to nano/scripts/libraries/jquery.js
diff --git a/nano/scripts/libraries/2_jquery.timers.js b/nano/scripts/libraries/jquery.timers.js
similarity index 100%
rename from nano/scripts/libraries/2_jquery.timers.js
rename to nano/scripts/libraries/jquery.timers.js
diff --git a/nano/scripts/nano/2_nano_state_manager.js b/nano/scripts/nano/2_nano_state_manager.js
deleted file mode 100644
index 223cebf1460..00000000000
--- a/nano/scripts/nano/2_nano_state_manager.js
+++ /dev/null
@@ -1,224 +0,0 @@
-// NanoStateManager handles data from the server and uses it to render templates
-NanoStateManager = function ()
-{
- // _isInitialised is set to true when all of this ui's templates have been processed/rendered
- var _isInitialised = false;
-
- // the data for this ui
- var _data = null;
-
- // this is an array of callbacks which are called when new data arrives, before it is processed
- var _beforeUpdateCallbacks = {};
- // this is an array of callbacks which are called when new data arrives, before it is processed
- var _afterUpdateCallbacks = {};
-
- // this is an array of state objects, these can be used to provide custom javascript logic
- var _states = {};
-
- var _currentState = null;
-
- // the init function is called when the ui has loaded
- // this function sets up the templates and base functionality
- var init = function ()
- {
- // We store initialData and templateData in the body tag, it's as good a place as any
- _data = $('body').data('initialData');
-
- if (_data == null || !_data.hasOwnProperty('config') || !_data.hasOwnProperty('data'))
- {
- alert('Error: Initial data did not load correctly.');
- }
-
- var stateKey = 'default';
- if (_data['config'].hasOwnProperty('stateKey') && _data['config']['stateKey'])
- {
- stateKey = _data['config']['stateKey'].toLowerCase();
- }
-
- NanoStateManager.setCurrentState(stateKey);
-
- $(document).on('templatesLoaded', function () {
- doUpdate(_data);
-
- _isInitialised = true;
- });
- };
-
- // Receive update data from the server
- var receiveUpdateData = function (jsonString)
- {
- var updateData;
-
- // alert("recieveUpdateData called." + "
Type: " + typeof jsonString); //debug hook
- try
- {
- // parse the JSON string from the server into a JSON object
- updateData = jQuery.parseJSON(jsonString);
- }
- catch (error)
- {
- alert("recieveUpdateData failed. " + "
Error name: " + error.name + "
Error Message: " + error.message);
- return;
- }
-
- // alert("recieveUpdateData passed trycatch block."); //debug hook
-
- if (!updateData.hasOwnProperty('data'))
- {
- if (_data && _data.hasOwnProperty('data'))
- {
- updateData['data'] = _data['data'];
- }
- else
- {
- updateData['data'] = {};
- }
- }
-
- if (_isInitialised) // all templates have been registered, so render them
- {
- doUpdate(updateData);
- }
- else
- {
- _data = updateData; // all templates have not been registered. We set _data directly here which will be applied after the template is loaded with the initial data
- }
- };
-
- // This function does the update by calling the methods on the current state
- var doUpdate = function (data)
- {
- if (_currentState == null)
- {
- return;
- }
-
- data = _currentState.onBeforeUpdate(data);
-
- if (data === false)
- {
- alert('data is false, return');
- return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring
- }
-
- _data = data;
-
- _currentState.onUpdate(_data);
-
- _currentState.onAfterUpdate(_data);
- };
-
- // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification
- var executeCallbacks = function (callbacks, data)
- {
- for (var key in callbacks)
- {
- if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key]))
- {
- data = callbacks[key].call(this, data);
- }
- }
-
- return data;
- };
-
- return {
- init: function ()
- {
- init();
- },
- receiveUpdateData: function (jsonString)
- {
- receiveUpdateData(jsonString);
- },
- addBeforeUpdateCallback: function (key, callbackFunction)
- {
- _beforeUpdateCallbacks[key] = callbackFunction;
- },
- addBeforeUpdateCallbacks: function (callbacks) {
- for (var callbackKey in callbacks) {
- if (!callbacks.hasOwnProperty(callbackKey))
- {
- continue;
- }
- NanoStateManager.addBeforeUpdateCallback(callbackKey, callbacks[callbackKey]);
- }
- },
- removeBeforeUpdateCallback: function (key)
- {
- if (_beforeUpdateCallbacks.hasOwnProperty(key))
- {
- delete _beforeUpdateCallbacks[key];
- }
- },
- executeBeforeUpdateCallbacks: function (data) {
- return executeCallbacks(_beforeUpdateCallbacks, data);
- },
- addAfterUpdateCallback: function (key, callbackFunction)
- {
- _afterUpdateCallbacks[key] = callbackFunction;
- },
- addAfterUpdateCallbacks: function (callbacks) {
- for (var callbackKey in callbacks) {
- if (!callbacks.hasOwnProperty(callbackKey))
- {
- continue;
- }
- NanoStateManager.addAfterUpdateCallback(callbackKey, callbacks[callbackKey]);
- }
- },
- removeAfterUpdateCallback: function (key)
- {
- if (_afterUpdateCallbacks.hasOwnProperty(key))
- {
- delete _afterUpdateCallbacks[key];
- }
- },
- executeAfterUpdateCallbacks: function (data) {
- return executeCallbacks(_afterUpdateCallbacks, data);
- },
- addState: function (state)
- {
- if (!(state instanceof NanoStateClass))
- {
- alert('ERROR: Attempted to add a state which is not instanceof NanoStateClass');
- return;
- }
- if (!state.key)
- {
- alert('ERROR: Attempted to add a state with an invalid stateKey');
- return;
- }
- _states[state.key] = state;
- },
- setCurrentState: function (stateKey)
- {
- if (typeof stateKey == 'undefined' || !stateKey) {
- alert('ERROR: No state key was passed!');
- return false;
- }
- if (!_states.hasOwnProperty(stateKey))
- {
- alert('ERROR: Attempted to set a current state which does not exist: ' + stateKey);
- return false;
- }
-
- var previousState = _currentState;
-
- _currentState = _states[stateKey];
-
- if (previousState != null) {
- previousState.onRemove(_currentState);
- }
-
- _currentState.onAdd(previousState);
-
- return true;
- },
- getCurrentState: function ()
- {
- return _currentState;
- }
- };
-} ();
-
\ No newline at end of file
diff --git a/nano/scripts/nano/6_nano_base_helpers.js b/nano/scripts/nano/6_nano_base_helpers.js
deleted file mode 100644
index 3f93a63934e..00000000000
--- a/nano/scripts/nano/6_nano_base_helpers.js
+++ /dev/null
@@ -1,281 +0,0 @@
-// NanoBaseHelpers is where the base template helpers (common to all templates) are stored
-NanoBaseHelpers = function ()
-{
- var _baseHelpers = {
- // change ui styling to "syndicate mode"
- syndicateMode: function() {
- $('body').css("background-color","#8f1414");
- $('body').css("background-image","url('uiBackground-Syndicate.png')");
- $('body').css("background-position","50% 0");
- $('body').css("background-repeat","repeat-x");
-
- $('#uiTitleFluff').css("background-image","url('uiTitleFluff-Syndicate.png')");
- $('#uiTitleFluff').css("background-position","50% 50%");
- $('#uiTitleFluff').css("background-repeat", "no-repeat");
-
- return '';
- },
- combine: function( arr1, arr2 ) {
- return arr1 && arr2 ? arr1.concat(arr2) : arr1 || arr2;
- },
- dump: function( arr1 ) {
- return JSON.stringify(arr1);
- },
- // Generate a Byond link
- link: function( text, icon, parameters, status, elementClass, elementId) {
-
- var iconHtml = '';
- var iconClass = 'noIcon';
- if (typeof icon != 'undefined' && icon)
- {
- iconHtml = '';
- iconClass = 'hasIcon';
- }
-
- if (typeof elementClass == 'undefined' || !elementClass)
- {
- elementClass = 'link';
- }
-
- var elementIdHtml = '';
- if (typeof elementId != 'undefined' && elementId)
- {
- elementIdHtml = 'id="' + elementId + '"';
- }
-
- if (typeof status != 'undefined' && status)
- {
- return '' + iconHtml + text + '
';
- }
-
- return '' + iconHtml + text + '
';
- },
- // Since jsrender breaks the ^ operator
- xor: function(number,bit) {
- return number ^ bit;
- },
- precisionRound: function (value, places) {
- if(places==0)
- return Math.round(number);
- var multiplier = Math.pow(10, places);
- return (Math.round(value * multiplier) / multiplier);
- },
- // Round a number to the nearest integer
- round: function(number) {
- return Math.round(number);
- },
- fixed: function(number) {
- return Math.round(number * 10) / 10;
- },
- // Round a number down to integer
- floor: function(number) {
- return Math.floor(number);
- },
- // Round a number up to integer
- ceil: function(number) {
- return Math.ceil(number);
- },
- // Format a string (~string("Hello {0}, how are {1}?", 'Martin', 'you') becomes "Hello Martin, how are you?")
- string: function() {
- if (arguments.length == 0)
- {
- return '';
- }
- else if (arguments.length == 1)
- {
- return arguments[0];
- }
- else if (arguments.length > 1)
- {
- stringArgs = [];
- for (var i = 1; i < arguments.length; i++)
- {
- stringArgs.push(arguments[i]);
- }
- return arguments[0].format(stringArgs);
- }
- return '';
- },
- formatNumber: function(x) {
- // From http://stackoverflow.com/questions/2901102/how-to-print-a-number-with-commas-as-thousands-separators-in-javascript
- var parts = x.toString().split(".");
- parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
- return parts.join(".");
- },
- // Capitalize the first letter of a string. From http://stackoverflow.com/questions/1026069/capitalize-the-first-letter-of-string-in-javascript
- capitalizeFirstLetter: function(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
- },
- // Display a bar. Used to show health, capacity, etc.
- displayBar: function(value, rangeMin, rangeMax, styleClass, showText) {
-
- if (rangeMin < rangeMax)
- {
- if (value < rangeMin)
- {
- value = rangeMin;
- }
- else if (value > rangeMax)
- {
- value = rangeMax;
- }
- }
- else
- {
- if (value > rangeMin)
- {
- value = rangeMin;
- }
- else if (value < rangeMax)
- {
- value = rangeMax;
- }
- }
-
- if (typeof styleClass == 'undefined' || !styleClass)
- {
- styleClass = '';
- }
-
- if (typeof showText == 'undefined' || !showText)
- {
- showText = '';
- }
-
- var percentage = Math.round((value - rangeMin) / (rangeMax - rangeMin) * 100);
-
- return '';
- },
- // Convert danger level to class (for the air alarm)
- dangerToClass: function(level) {
- if(level==0) return 'good';
- if(level==1) return 'average';
- return 'bad';
- },
- dangerToSpan: function(level) {
- if(level==0) return '"Good"';
- if(level==1) return '"Minor Alert"';
- return '"Major Alert"';
- },
- generateHref: function (parameters) {
- var body = $('body'); // We store data in the body tag, it's as good a place as any
- _urlParameters = body.data('urlParameters');
- var queryString = '?';
-
- for (var key in _urlParameters)
- {
- if (_urlParameters.hasOwnProperty(key))
- {
- if (queryString !== '?')
- {
- queryString += ';';
- }
- queryString += key + '=' + _urlParameters[key];
- }
- }
-
- for (var key in parameters)
- {
- if (parameters.hasOwnProperty(key))
- {
- if (queryString !== '?')
- {
- queryString += ';';
- }
- queryString += key + '=' + parameters[key];
- }
- }
- return queryString;
- },
- // Display DNA Blocks (for the DNA Modifier UI)
- displayDNABlocks: function(dnaString, selectedBlock, selectedSubblock, blockSize, paramKey) {
- if (!dnaString)
- {
- return 'Please place a valid subject into the DNA modifier.
';
- }
-
- var characters = dnaString.split('');
-
- var html = '1
';
- var block = 1;
- var subblock = 1;
- for (index in characters)
- {
- if (!characters.hasOwnProperty(index) || typeof characters[index] === 'object')
- {
- continue;
- }
-
- var parameters;
- if (paramKey.toUpperCase() == 'UI')
- {
- parameters = { 'selectUIBlock' : block, 'selectUISubblock' : subblock };
- }
- else
- {
- parameters = { 'selectSEBlock' : block, 'selectSESubblock' : subblock };
- }
-
- var status = 'linkActive';
- if (block == selectedBlock && subblock == selectedSubblock)
- {
- status = 'selected';
- }
-
- html += '
' + characters[index] + '
'
-
- index++;
- if (index % blockSize == 0 && index < characters.length)
- {
- block++;
- subblock = 1;
- html += '
' + block + '
';
- }
- else
- {
- subblock++;
- }
- }
-
- html += '
' + iconHtml + text + '
';
+ }
+
+ return '' + iconHtml + text + '
';
+ },
+
+ xor: function (number,bit) {
+ return number ^ bit;
+ },
+
+ precisionRound: function (value, places) {
+ if(places == 0){
+ return Math.round(number);
+ }
+ var multiplier = Math.pow(10, places);
+ return (Math.round(value * multiplier) / multiplier);
+ },
+
+ // Round a number to the nearest integer
+ round: function(number) {
+ return Math.round(number);
+ },
+ fixed: function(number) {
+ return Math.round(number * 10) / 10;
+ },
+ // Round a number down to integer
+ floor: function(number) {
+ return Math.floor(number);
+ },
+ // Round a number up to integer
+ ceil: function(number) {
+ return Math.ceil(number);
+ },
+
+ // Format a string (~string("Hello {0}, how are {1}?", 'Martin', 'you') becomes "Hello Martin, how are you?")
+ string: function() {
+ if (arguments.length == 0)
+ {
+ return '';
+ }
+ else if (arguments.length == 1)
+ {
+ return arguments[0];
+ }
+ else if (arguments.length > 1)
+ {
+ stringArgs = [];
+ for (var i = 1; i < arguments.length; i++)
+ {
+ stringArgs.push(arguments[i]);
+ }
+ return arguments[0].format(stringArgs);
+ }
+ return '';
+ },
+ formatNumber: function(x) {
+ // From http://stackoverflow.com/questions/2901102/how-to-print-a-number-with-commas-as-thousands-separators-in-javascript
+ var parts = x.toString().split(".");
+ parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+ return parts.join(".");
+ },
+ // Capitalize the first letter of a string. From http://stackoverflow.com/questions/1026069/capitalize-the-first-letter-of-string-in-javascript
+ capitalizeFirstLetter: function( string ) {
+ return string.charAt(0).toUpperCase() + string.slice(1);
+ },
+ // Display a bar. Used to show health, capacity, etc.
+ displayBar: function( value, rangeMin, rangeMax, styleClass, showText ) {
+
+ if (rangeMin < rangeMax)
+ {
+ if (value < rangeMin)
+ {
+ value = rangeMin;
+ }
+ else if (value > rangeMax)
+ {
+ value = rangeMax;
+ }
+ }
+ else
+ {
+ if (value > rangeMin)
+ {
+ value = rangeMin;
+ }
+ else if (value < rangeMax)
+ {
+ value = rangeMax;
+ }
+ }
+
+ if (typeof styleClass == 'undefined' || !styleClass)
+ {
+ styleClass = '';
+ }
+
+ if (typeof showText == 'undefined' || !showText)
+ {
+ showText = '';
+ }
+
+ var percentage = Math.round((value - rangeMin) / (rangeMax - rangeMin) * 100);
+
+ return '';
+ },
+ // Convert danger level to class (for the air alarm)
+ dangerToClass: function(level) {
+ if(level == 0) return 'good';
+ if(level == 1) return 'average';
+ return 'bad';
+ },
+ dangerToSpan: function(level) {
+ if(level == 0) return '"Good"';
+ if(level == 1) return '"Minor Alert"';
+ return '"Major Alert"';
+ },
+ generateHref: function (parameters) {
+ var body = $('body'); // For some fucking reason, data is stored in the body tag.
+ _urlParameters = body.data('urlParameters');
+ var queryString = '?';
+
+ for (var key in _urlParameters)
+ {
+ if (_urlParameters.hasOwnProperty(key))
+ {
+ if (queryString !== '?')
+ {
+ queryString += ';';
+ }
+ queryString += key + '=' + _urlParameters[key];
+ }
+ }
+
+ for (var key in parameters)
+ {
+ if (parameters.hasOwnProperty(key))
+ {
+ if (queryString !== '?')
+ {
+ queryString += ';';
+ }
+ queryString += key + '=' + parameters[key];
+ }
+ }
+ return queryString;
+ },
+ // Display DNA Blocks (for the DNA Modifier UI)
+ displayDNABlocks: function(dnaString, selectedBlock, selectedSubblock, blockSize, paramKey) {
+ if (!dnaString)
+ {
+ return 'Please place a valid subject into the DNA modifier.
';
+ }
+
+ var characters = dnaString.split('');
+
+ var html = '1
';
+ var block = 1;
+ var subblock = 1;
+ for (var index in characters) {
+ if (!characters.hasOwnProperty(index) || typeof characters[index] === 'object')
+ {
+ continue;
+ }
+
+ var parameters;
+ if (paramKey.toUpperCase() == 'UI'){
+ parameters = { 'selectUIBlock' : block, 'selectUISubblock' : subblock };
+ } else {
+ parameters = { 'selectSEBlock' : block, 'selectSESubblock' : subblock };
+ }
+
+ var status = 'linkActive';
+ if (block == selectedBlock && subblock == selectedSubblock) {
+ status = 'selected';
+ }
+
+ html += '
' + characters[index] + '
';
+
+ index++;
+ if (index % blockSize == 0 && index < characters.length) {
+ block++;
+ subblock = 1;
+ html += '
' + block + '
';
+ } else {
+ subblock++;
+ }
+ }
+
+ html += '
Type: " + typeof jsonString); //debug hook
+ try
+ {
+ // parse the JSON string from the server into a JSON object
+ updateData = jQuery.parseJSON(jsonString);
+ }
+ catch (error)
+ {
+ reportError("recieveUpdateData failed. " + "
Error name: " + error.name + "
Error Message: " + error.message);
+ return;
+ }
+
+ // reportError("recieveUpdateData passed trycatch block."); //debug hook
+
+ if (!updateData.hasOwnProperty('data'))
+ {
+ if (_data && _data.hasOwnProperty('data'))
+ {
+ updateData['data'] = _data['data'];
+ }
+ else
+ {
+ updateData['data'] = {};
+ }
+ }
+
+ if (_isInitialised) // all templates have been registered, so render them
+ {
+ doUpdate(updateData);
+ }
+ else
+ {
+ _data = updateData; // all templates have not been registered. We set _data directly here which will be applied after the template is loaded with the initial data
+ }
+ };
+
+ // This function does the update by calling the methods on the current state
+ var doUpdate = function (data)
+ {
+ if (_currentState == null)
+ {
+ return;
+ }
+
+ data = _currentState.onBeforeUpdate(data);
+
+ if (data === false)
+ {
+ reportError('data is false, return');
+ return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring
+ }
+
+ _data = data;
+
+ _currentState.onUpdate(_data);
+
+ _currentState.onAfterUpdate(_data);
+ };
+
+ // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification
+ var executeCallbacks = function (callbacks, data)
+ {
+ for (var key in callbacks)
+ {
+ if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key]))
+ {
+ data = callbacks[key].call(this, data);
+ }
+ }
+
+ return data;
+ };
+
+ return {
+ init: function ()
+ {
+ init();
+ },
+ receiveUpdateData: function (jsonString)
+ {
+ receiveUpdateData(jsonString);
+ },
+ addBeforeUpdateCallback: function (key, callbackFunction)
+ {
+ _beforeUpdateCallbacks[key] = callbackFunction;
+ },
+ addBeforeUpdateCallbacks: function (callbacks) {
+ for (var callbackKey in callbacks) {
+ if (!callbacks.hasOwnProperty(callbackKey))
+ {
+ continue;
+ }
+ NanoStateManager.addBeforeUpdateCallback(callbackKey, callbacks[callbackKey]);
+ }
+ },
+ removeBeforeUpdateCallback: function (key)
+ {
+ if (_beforeUpdateCallbacks.hasOwnProperty(key))
+ {
+ delete _beforeUpdateCallbacks[key];
+ }
+ },
+ executeBeforeUpdateCallbacks: function (data) {
+ return executeCallbacks(_beforeUpdateCallbacks, data);
+ },
+ addAfterUpdateCallback: function (key, callbackFunction)
+ {
+ _afterUpdateCallbacks[key] = callbackFunction;
+ },
+ addAfterUpdateCallbacks: function (callbacks) {
+ for (var callbackKey in callbacks) {
+ if (!callbacks.hasOwnProperty(callbackKey))
+ {
+ continue;
+ }
+ NanoStateManager.addAfterUpdateCallback(callbackKey, callbacks[callbackKey]);
+ }
+ },
+ removeAfterUpdateCallback: function (key)
+ {
+ if (_afterUpdateCallbacks.hasOwnProperty(key))
+ {
+ delete _afterUpdateCallbacks[key];
+ }
+ },
+ executeAfterUpdateCallbacks: function (data) {
+ return executeCallbacks(_afterUpdateCallbacks, data);
+ },
+ addState: function (state)
+ {
+ if (!(state instanceof NanoStateClass))
+ {
+ reportError('ERROR: Attempted to add a state which is not instanceof NanoStateClass');
+ return;
+ }
+ if (!state.key)
+ {
+ reportError('ERROR: Attempted to add a state with an invalid stateKey');
+ return;
+ }
+ _states[state.key] = state;
+ },
+ setCurrentState: function (stateKey)
+ {
+ if (typeof stateKey == 'undefined' || !stateKey) {
+ reportError('ERROR: No state key was passed!');
+ return false;
+ }
+ if (!_states.hasOwnProperty(stateKey))
+ {
+ reportError('ERROR: Attempted to set a current state which does not exist: ' + stateKey);
+ return false;
+ }
+
+ var previousState = _currentState;
+
+ _currentState = _states[stateKey];
+
+ if (previousState != null) {
+ previousState.onRemove(_currentState);
+ }
+
+ _currentState.onAdd(previousState);
+
+ return true;
+ },
+ getCurrentState: function ()
+ {
+ return _currentState;
+ }
+ };
+} ();
+
\ No newline at end of file
diff --git a/nano/scripts/nano/1_nano_template.js b/nano/scripts/nano/nano_template.js
similarity index 57%
rename from nano/scripts/nano/1_nano_template.js
rename to nano/scripts/nano/nano_template.js
index f8f5d265948..7350e62d48d 100644
--- a/nano/scripts/nano/1_nano_template.js
+++ b/nano/scripts/nano/nano_template.js
@@ -5,19 +5,19 @@ var NanoTemplate = function () {
var _templates = {};
var _compiledTemplates = {};
-
- var _helpers = {};
+
+ var _helpers = {};
var init = function () {
// We store templateData in the body tag, it's as good a place as any
- _templateData = $('body').data('templateData');
+ _templateData = $('body').data('templateData');
- if (_templateData == null)
- {
- alert('Error: Template data did not load correctly.');
- }
+ if (_templateData == null)
+ {
+ reportError('Error: Template data did not load correctly.');
+ }
- loadNextTemplate();
+ loadNextTemplate();
};
var loadNextTemplate = function () {
@@ -43,40 +43,36 @@ var NanoTemplate = function () {
cache: false,
dataType: 'text'
}))
- .done(function(templateMarkup) {
+ .done( function(templateMarkup) {
templateMarkup += '';
- try
- {
+ try {
NanoTemplate.addTemplate(key, templateMarkup);
}
- catch(error)
- {
- alert('ERROR: An error occurred while loading the UI: ' + error.message);
+ catch(error) {
+ reportError('ERROR: An error occurred while loading the UI: ' + error.message);
return;
}
delete _templateData[key];
-
loadNextTemplate();
})
- .fail(function () {
- alert('ERROR: Loading template ' + key + '(' + _templateData[key] + ') failed!');
+ .fail( function () {
+ reportError('ERROR: Loading template ' + key + '(' + _templateData[key] + ') failed!');
});
return;
}
- }
+ };
var compileTemplates = function () {
-
for (var key in _templates) {
try {
- _compiledTemplates[key] = doT.template(_templates[key], null, _templates)
+ _compiledTemplates[key] = doT.template(_templates[key], null, _templates);
}
catch (error) {
- alert(error.message);
+ reportError(error.message);
}
}
};
@@ -94,42 +90,40 @@ var NanoTemplate = function () {
parse: function (templateKey, data) {
if (!_compiledTemplates.hasOwnProperty(templateKey) || !_compiledTemplates[templateKey]) {
if (!_templates.hasOwnProperty(templateKey)) {
- alert('ERROR: Template "' + templateKey + '" does not exist in _compiledTemplates!');
+ reportError('ERROR: Template "' + templateKey + '" does not exist in _compiledTemplates!');
return 'Template error (does not exist)
';
}
compileTemplates();
}
if (typeof _compiledTemplates[templateKey] != 'function') {
- alert(_compiledTemplates[templateKey]);
- alert('ERROR: Template "' + templateKey + '" failed to compile!');
+ reportError(_compiledTemplates[templateKey]);
+ reportError('ERROR: Template "' + templateKey + '" failed to compile!');
return 'Template error (failed to compile)
';
}
return _compiledTemplates[templateKey].call(this, data['data'], data['config'], _helpers);
},
- addHelper: function (helperName, helperFunction) {
- if (!jQuery.isFunction(helperFunction)) {
- alert('NanoTemplate.addHelper failed to add ' + helperName + ' as it is not a function.');
- return;
- }
-
- _helpers[helperName] = helperFunction;
- },
- addHelpers: function (helpers) {
- for (var helperName in helpers) {
- if (!helpers.hasOwnProperty(helperName))
- {
- continue;
- }
- NanoTemplate.addHelper(helperName, helpers[helperName]);
- }
- },
- removeHelper: function (helperName) {
- if (helpers.hasOwnProperty(helperName))
- {
- delete _helpers[helperName];
- }
- }
- }
+ addHelper: function (helperName, helperFunction) {
+ if (!jQuery.isFunction(helperFunction)) {
+ reportError('NanoTemplate.addHelper failed to add ' + helperName + ' as it is not a function.');
+ return;
+ }
+
+ _helpers[helperName] = helperFunction;
+ },
+ addHelpers: function (helpers) {
+ for (var helperName in helpers) {
+ if (!helpers.hasOwnProperty(helperName))
+ {
+ continue;
+ }
+ NanoTemplate.addHelper(helperName, helpers[helperName]);
+ }
+ },
+ removeHelper: function (helperName) {
+ if (helpers.hasOwnProperty(helperName))
+ {
+ delete _helpers[helperName];
+ }
+ }
+ };
}();
-
-
diff --git a/nano/scripts/nano/0_nano_utility.js b/nano/scripts/nano/nano_utility.js
similarity index 68%
rename from nano/scripts/nano/0_nano_utility.js
rename to nano/scripts/nano/nano_utility.js
index e65b7bbd138..bae16149874 100644
--- a/nano/scripts/nano/0_nano_utility.js
+++ b/nano/scripts/nano/nano_utility.js
@@ -1,68 +1,56 @@
// NanoUtility is the place to store utility functions
-var NanoUtility = function ()
-{
+var NanoUtility = function () {
var _urlParameters = {}; // This is populated with the base url parameters (used by all links), which is probaby just the "src" parameter
- return {
- init: function ()
- {
- var body = $('body'); // We store data in the body tag, it's as good a place as any
-
- _urlParameters = body.data('urlParameters');
+ return {
+ init: function () {
+ var body = $('body'); // We store data in the body tag, it's as good a place as any
+ _urlParameters = body.data('urlParameters');
},
- // generate a Byond href, combines _urlParameters with parameters
- generateHref: function (parameters)
- {
- var queryString = '?';
+ // generate a Byond href, combines _urlParameters with parameters
+ generateHref: function (parameters) {
+ var queryString = '?';
- for (var key in _urlParameters)
- {
- if (_urlParameters.hasOwnProperty(key))
- {
- if (queryString !== '?')
- {
- queryString += ';';
- }
- queryString += key + '=' + _urlParameters[key];
- }
- }
+ for (var key in _urlParameters) {
+ if (_urlParameters.hasOwnProperty(key)) {
+ if (queryString !== '?') {
+ queryString += ';';
+ }
+ queryString += key + '=' + _urlParameters[key];
+ }
+ }
- for (var key in parameters)
- {
- if (parameters.hasOwnProperty(key))
- {
- if (queryString !== '?')
- {
- queryString += ';';
- }
- queryString += key + '=' + parameters[key];
- }
- }
- return queryString;
- }
+ for (var key in parameters)
+ {
+ if (parameters.hasOwnProperty(key)) {
+ if (queryString !== '?') {
+ queryString += ';';
+ }
+ queryString += key + '=' + parameters[key];
+ }
+ }
+ return queryString;
+ }
}
-} ();
+} ();
if (typeof jQuery == 'undefined') {
- alert('ERROR: Javascript library failed to load!');
+ reportError('ERROR: Javascript library failed to load!');
}
if (typeof doT == 'undefined') {
- alert('ERROR: Template engine failed to load!');
-}
+ reportError('ERROR: Template engine failed to load!');
+}
-(function() {
- var _alert = window.alert;
- window.alert = function(str) {
- window.location = "byond://?nano_err=" + encodeURIComponent(str);
- _alert(str);
- };
-})();
+var reportError = function (str) {
+ window.location = "byond://?nano_err=" + encodeURIComponent(str);
+ alert(str);
+}
// All scripts are initialised here, this allows control of init order
$(document).ready(function () {
- NanoUtility.init();
- NanoStateManager.init();
- NanoTemplate.init();
+ NanoUtility.init();
+ NanoStateManager.init();
+ NanoTemplate.init();
});
if (!Array.prototype.indexOf)