diff options
Diffstat (limited to 'module/web/app/scripts/utils')
| -rw-r--r-- | module/web/app/scripts/utils/animations.js | 1 | ||||
| -rw-r--r-- | module/web/app/scripts/utils/apitypes.js | 2 | ||||
| -rw-r--r-- | module/web/app/scripts/utils/dialogs.js | 7 | ||||
| -rw-r--r-- | module/web/app/scripts/utils/initHB.js | 1 | ||||
| -rw-r--r-- | module/web/app/scripts/utils/lazyRequire.js | 11 | ||||
| -rw-r--r-- | module/web/app/scripts/utils/remaining.js | 149 |
6 files changed, 14 insertions, 157 deletions
diff --git a/module/web/app/scripts/utils/animations.js b/module/web/app/scripts/utils/animations.js index 5131d3b8a..7f89afef1 100644 --- a/module/web/app/scripts/utils/animations.js +++ b/module/web/app/scripts/utils/animations.js @@ -1,4 +1,5 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) { + 'use strict'; // Adds an element and computes its height, which is saved as data attribute // Important function to have slide animations diff --git a/module/web/app/scripts/utils/apitypes.js b/module/web/app/scripts/utils/apitypes.js index 28620250e..cbbc9064f 100644 --- a/module/web/app/scripts/utils/apitypes.js +++ b/module/web/app/scripts/utils/apitypes.js @@ -1,5 +1,7 @@ // Autogenerated, do not edit! +/*jslint -W070: false*/ define([], function() { + 'use strict'; return { DownloadState: {'Failed': 3, 'All': 0, 'Unmanaged': 4, 'Finished': 1, 'Unfinished': 2}, DownloadStatus: {'Downloading': 10, 'NA': 0, 'Processing': 14, 'Waiting': 9, 'Decrypting': 13, 'Paused': 4, 'Failed': 7, 'Finished': 5, 'Skipped': 6, 'Unknown': 16, 'Aborted': 12, 'Online': 2, 'TempOffline': 11, 'Offline': 1, 'Custom': 15, 'Starting': 8, 'Queued': 3}, diff --git a/module/web/app/scripts/utils/dialogs.js b/module/web/app/scripts/utils/dialogs.js index 13478ff88..4933b7ed2 100644 --- a/module/web/app/scripts/utils/dialogs.js +++ b/module/web/app/scripts/utils/dialogs.js @@ -1,13 +1,14 @@ // Loads all helper and set own handlebars rules -define(['jquery', 'underscore', 'views/abstract/modalView'], function($, _, modal) { +define(['jquery', 'underscore', 'views/abstract/modalView'], function($, _, Modal) { + 'use strict'; // Shows the confirm dialog for given context // on success executes func with context _.confirm = function(template, func, context) { - template = "text!tpl/" + template; + template = 'text!tpl/' + template; _.requireOnce([template], function(html) { var template = _.compile(html); - var dialog = new modal(template, _.bind(func, context)); + var dialog = new Modal(template, _.bind(func, context)); dialog.show(); }); diff --git a/module/web/app/scripts/utils/initHB.js b/module/web/app/scripts/utils/initHB.js index c977f063d..d7f582521 100644 --- a/module/web/app/scripts/utils/initHB.js +++ b/module/web/app/scripts/utils/initHB.js @@ -2,6 +2,7 @@ define(['underscore', 'handlebars', 'helpers/formatSize', 'helpers/fileHelper', 'helpers/formatTime'], function(_, Handlebars) { + 'use strict'; // Replace with own lexer rules compiled from handlebars.l Handlebars.Parser.lexer.rules = [/^(?:[^\x00]*?(?=(<%)))/, /^(?:[^\x00]+)/, /^(?:[^\x00]{2,}?(?=(\{\{|$)))/, /^(?:\{\{>)/, /^(?:<%=)/, /^(?:<%\/)/, /^(?:\{\{\^)/, /^(?:<%\s*else\b)/, /^(?:\{<%%)/, /^(?:\{\{&)/, /^(?:<%![\s\S]*?%>)/, /^(?:<%)/, /^(?:=)/, /^(?:\.(?=[%} ]))/, /^(?:\.\.)/, /^(?:[\/.])/, /^(?:\s+)/, /^(?:%%>)/, /^(?:%>)/, /^(?:"(\\["]|[^"])*")/, /^(?:'(\\[']|[^'])*')/, /^(?:@[a-zA-Z]+)/, /^(?:true(?=[%}\s]))/, /^(?:false(?=[%}\s]))/, /^(?:[0-9]+(?=[%}\s]))/, /^(?:[a-zA-Z0-9_$-]+(?=[=%}\s\/.]))/, /^(?:\[[^\]]*\])/, /^(?:.)/, /^(?:$)/]; _.compile = Handlebars.compile; diff --git a/module/web/app/scripts/utils/lazyRequire.js b/module/web/app/scripts/utils/lazyRequire.js index b381e0ce6..96c07aa24 100644 --- a/module/web/app/scripts/utils/lazyRequire.js +++ b/module/web/app/scripts/utils/lazyRequire.js @@ -1,17 +1,18 @@ // Define the module. define( [ - "require", "underscore" + 'require', 'underscore' ], function( require, _ ){ + 'use strict'; // Define the states of loading for a given set of modules // within a require() statement. var states = { - unloaded: "UNLOADED", - loading: "LOADING", - loaded: "LOADED" + unloaded: 'UNLOADED', + loading: 'LOADING', + loaded: 'LOADED' }; @@ -86,7 +87,7 @@ define( if (!_.has(instances, dependencies)) instances[dependencies] = lazyRequire.once(); - return instances[dependencies](dependencies, loadCallback) + return instances[dependencies](dependencies, loadCallback); }; diff --git a/module/web/app/scripts/utils/remaining.js b/module/web/app/scripts/utils/remaining.js deleted file mode 100644 index d66a2931a..000000000 --- a/module/web/app/scripts/utils/remaining.js +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Javascript Countdown - * Copyright (c) 2009 Markus Hedlund - * Version 1.1 - * Licensed under MIT license - * http://www.opensource.org/licenses/mit-license.php - * http://labs.mimmin.com/countdown - */ -define([], function() { - var remaining = { - /** - * Get the difference of the passed date, and now. The different formats of the taget parameter are: - * January 12, 2009 15:14:00 (Month dd, yyyy hh:mm:ss) - * January 12, 2009 (Month dd, yyyy) - * 09,00,12,15,14,00 (yy,mm,dd,hh,mm,ss) Months range from 0-11, not 1-12. - * 09,00,12 (yy,mm,dd) Months range from 0-11, not 1-12. - * 500 (milliseconds) - * 2009-01-12 15:14:00 (yyyy-mm-dd hh-mm-ss) - * 2009-01-12 15:14 (yyyy-mm-dd hh-mm) - * @param target Target date. Can be either a date object or a string (formated like '24 December, 2010 15:00:00') - * @return Difference in seconds - */ - getSeconds: function(target) { - var today = new Date(); - - if (typeof(target) == 'object') { - var targetDate = target; - } else { - var matches = target.match(/(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})(:(\d{2}))?/); // YYYY-MM-DD HH-MM-SS - if (matches != null) { - matches[7] = typeof(matches[7]) == 'undefined' ? '00' : matches[7]; - var targetDate = new Date(matches[1], matches[2] - 1, matches[3], matches[4], matches[5], matches[7]); - } else { - var targetDate = new Date(target); - } - } - - return Math.floor((targetDate.getTime() - today.getTime()) / 1000); - }, - - /** - * @param seconds Difference in seconds - * @param i18n A language object (see code) - * @param onlyLargestUnit Return only the largest unit (see documentation) - * @param hideEmpty Hide empty units (see documentation) - * @return String formated something like '1 week, 1 hours, 1 second' - */ - getString: function(seconds, i18n, onlyLargestUnit, hideEmpty) { - if (seconds < 1) { - return ''; - } - - if (typeof(hideEmpty) == 'undefined' || hideEmpty == null) { - hideEmpty = true; - } - if (typeof(onlyLargestUnit) == 'undefined' || onlyLargestUnit == null) { - onlyLargestUnit = false; - } - if (typeof(i18n) == 'undefined' || i18n == null) { - i18n = { - weeks: ['week', 'weeks'], - days: ['day', 'days'], - hours: ['hour', 'hours'], - minutes: ['minute', 'minutes'], - seconds: ['second', 'seconds'] - }; - } - - var units = { - weeks: 7 * 24 * 60 * 60, - days: 24 * 60 * 60, - hours: 60 * 60, - minutes: 60, - seconds: 1 - }; - - var returnArray = []; - var value; - for (unit in units) { - value = units[unit]; - if (seconds / value >= 1 || unit == 'seconds' || !hideEmpty) { - secondsConverted = Math.floor(seconds / value); - var i18nUnit = i18n[unit][secondsConverted == 1 ? 0 : 1]; - returnArray.push(secondsConverted + ' ' + i18nUnit); - seconds -= secondsConverted * value; - - if (onlyLargestUnit) { - break; - } - } - } - ; - - return returnArray.join(', '); - }, - - /** - * @param seconds Difference in seconds - * @return String formated something like '169:00:01' - */ - getStringDigital: function(seconds) { - if (seconds < 1) { - return ''; - } - - remainingTime = remaining.getArray(seconds); - - for (index in remainingTime) { - remainingTime[index] = remaining.padNumber(remainingTime[index]); - } - ; - - return remainingTime.join(':'); - }, - - /** - * @param seconds Difference in seconds - * @return Array with hours, minutes and seconds - */ - getArray: function(seconds) { - if (seconds < 1) { - return []; - } - - var units = [60 * 60, 60, 1]; - - var returnArray = []; - var value; - for (index in units) { - value = units[index]; - secondsConverted = Math.floor(seconds / value); - returnArray.push(secondsConverted); - seconds -= secondsConverted * value; - } - ; - - return returnArray; - }, - - /** - * @param number An integer - * @return Integer padded with a 0 if necessary - */ - padNumber: function(number) { - return (number >= 0 && number < 10) ? '0' + number : number; - } - }; - return remaining; -});
\ No newline at end of file |