Commit e05a6360 authored by Christian's avatar Christian

updated dev dependencies

parent 070f6aab
......@@ -24,7 +24,7 @@ module.exports = function(grunt) {
// Default task(s).
var cleanBuild = ['clean:build'];
var defaultTasks = ['env:dev', 'clean:tmp', 'copy:tmp', 'eslint', 'preprocess', 'regex-replace', 'emberTemplates', 'concat:dev', 'sass', 'cssmin', 'copy:assets'];
var defaultTasks = ['env:dev', 'clean:tmp', 'copy:tmp', 'validate-package', 'eslint', 'preprocess', 'regex-replace', 'emberTemplates', 'concat:dev', 'sass', 'cssmin', 'copy:assets'];
var standaloneTasks = ['env:prod', 'clean:tmp', 'eslint', 'copy:tmp', 'clean:standalone', 'preprocess', 'regex-replace', 'emberTemplates', 'concat:prod', 'uglify', 'sass', 'cssmin', 'copy:standalone'];
var requiredWatchTasks = ['env:dev', 'clean:tmp', 'copy:tmp', 'preprocess', 'regex-replace', 'emberTemplates'];
var testingTasks;
......
......@@ -6,90 +6,117 @@
},
"rules": {
"no-spaced-func": 0,
"no-alert": 2,
"no-caller": 2,
"no-array-constructor": 2,
"no-bitwise": 0,
"no-caller": 2,
"no-catch-shadow": 2,
"no-console": 2,
"no-comma-dangle": 2,
"no-cond-assign": 2,
"no-console": 2,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-keys": 2,
"no-else-return": 0,
"no-empty": 2,
"no-empty-class": 2,
"no-empty-label": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-ex-assign": 2,
"no-func-assign": 2,
"no-floating-decimal": 0,
"no-implied-eval": 2,
"no-with": 2,
"no-extend-native": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-extra-strict": 2,
"no-fallthrough": 2,
"no-floating-decimal": 0,
"no-func-assign": 2,
"no-global-strict": 0,
"no-unreachable": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-unused-expressions": 0,
"no-octal": 2,
"no-octal-escape": 2,
"no-obj-calls": 2,
"no-implied-eval": 2,
"no-invalid-regexp": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-mixed-requires": [0, false],
"no-multi-str": 2,
"no-new-wrappers": 2,
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 0,
"no-new": 2,
"no-new-func": 2,
"no-native-reassign": 2,
"no-new-object": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 0,
"no-plusplus": 0,
"no-delete-var": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-return-assign": 2,
"no-new-array": 2,
"no-new-object": 2,
"no-label-var": 2,
"no-ternary": 0,
"no-script-url": 2,
"no-self-compare": 0,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-space-before-semi": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-undef": 2,
"no-undef-init": 2,
"no-underscore-dangle": 2,
"no-loop-func": 2,
"no-empty-label": 2,
"no-unused-vars": 2,
"no-script-url": 2,
"no-proto": 2,
"no-iterator": 2,
"no-mixed-requires": [0, false],
"no-wrap-func": 2,
"no-shadow": 2,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, "local"],
"no-use-before-define": 2,
"no-redeclare": 2,
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"no-wrap-func": 2,
"no-yoda": 2,
"brace-style": 0,
"block-scoped-var": 0,
"camelcase": 0,
"brace-style": [0, "1tbs"],
"camelcase": 2,
"complexity": [0, 11],
"consistent-return": 2,
"consistent-this": [0, "that"],
"curly": 2,
"curly": [2, "all"],
"dot-notation": 2,
"eqeqeq": 2,
"func-names": 0,
"func-style": [0, "declaration"],
"guard-for-in": 0,
"max-depth": [0, 4],
"max-len": [0, 80, 4],
"max-nested-callbacks": [0, 2],
"max-params": [0, 3],
"max-statements": [0, 10],
"new-cap": 0,
"handle-callback-err": 0,
"new-cap": 2,
"new-parens": 2,
"one-var": 0,
"quotes": [2, "single"],
"quote-props": 0,
"quotes": [2, "single"],
"radix": 0,
"regex-spaces": 2,
"space-infix-ops": 2,
"semi": 2,
"smarter-eqeqeq": 0,
"sort-vars": 0,
"space-in-brackets": [0, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-word-ops": 0,
"strict": 0,
"unnecessary-strict": 2,
"use-isnan": 2,
"valid-jsdoc": 0,
"wrap-iife": 0,
"wrap-regex": 0
}
}
\ No newline at end of file
}
......@@ -6,39 +6,28 @@
"start": "node app.js"
},
"dependencies": {
"express": "3.2.6"
"express": "^3.2.6"
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-cssmin": "~0.6.0",
"grunt-contrib-watch": "~0.3.1",
"grunt-env": "~0.4.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-sass": "~0.6.0",
"grunt-contrib-clean": "~0.4.1",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-compress": "~0.5.2",
"grunt-preprocess": "~2.3.0",
"grunt-regex-replace": "~0.2.5",
"load-grunt-tasks": "~0.2.0",
"qunitjs": "~1.12.0",
"karma-chrome-launcher": "~0.1.1",
"karma-firefox-launcher": "~0.1.2",
"karma-html2js-preprocessor": "~0.1.0",
"karma-script-launcher": "~0.1.0",
"karma-jasmine": "~0.1.3",
"karma-coffee-preprocessor": "~0.1.1",
"requirejs": "~2.1.9",
"karma-requirejs": "~0.2.0",
"karma-phantomjs-launcher": "~0.1.1",
"karma": "~0.10.7",
"karma-qunit": "~0.1.1",
"grunt-karma": "~0.6.2",
"karma-coverage": "~0.1.3",
"handlebars": "~1.1.2",
"ember-template-compiler": "~1.2.0",
"grunt": "^0.4.4",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-env": "^0.4.1",
"grunt-contrib-concat": "^0.3.0",
"grunt-sass": "^0.12.0",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-compress": "^0.7.0",
"grunt-preprocess": "^4.0.0",
"grunt-regex-replace": "^0.2.6",
"load-grunt-tasks": "^0.4.0",
"karma-phantomjs-launcher": "^0.1.2",
"karma": "^0.12.1",
"karma-qunit": "^0.1.1",
"grunt-karma": "^0.8.2",
"grunt-eslint": "^0.3.2",
"grunt-ember-templates": "~0.4.18",
"grunt-eslint": "~0.2.0"
"grunt-nsp-package": "0.0.2"
}
}
......@@ -46,9 +46,10 @@ GLOBE = GLOBE.reopen({
/**
* Sets a message for a specific alert
* @param {String} location
* @param {String} type
* @param {String} msg
* @param {String} location Alert storage location
* @param {String} type Alert type
* @param {String} msg Alert message
* @return {void}
*/
setAlert: function(location, type, msg){
if(this.get('alert').hasOwnProperty(location)){
......@@ -60,7 +61,8 @@ GLOBE = GLOBE.reopen({
},
/**
* Clears a specific alert
* @param {String} location
* @param {String} location Alert storage location
* @return {void}
*/
clearAlert: function(location){
if(this.get('alert').hasOwnProperty(location)){
......
......@@ -3,8 +3,8 @@ GLOBE.Formatter = {
/**
* Converts bandwidth to formatted bandwidth
*
* @param {String} value
* @returns {String}
* @param {String} value Value to format
* @returns {String} Bandwidth string
* @example
* // returns '2.05KB/s'
* GLOBE.Formatter.bandwidth(2048)
......@@ -34,7 +34,7 @@ GLOBE.Formatter = {
/**
* Creates HTML that displays a boolean value as styled HTML
*
* @param {Boolean|String} value
* @param {Boolean|String} value Value to format
* @returns {String} generated HTML
* @example
* // returns '"<span class="truefalse truefalse-true">true</span>"'
......
/*global $, moment, GLOBE, jsSHA */
/*eslint new-cap: 0 */
GLOBE.Util = {
/**
* Checks if a given string is a 40 char hex string
* @param {String} string
* @returns {Boolean}
* @param {String} string String to check
* @returns {Boolean} If the checked string is a 40 char hex
*/
is40CharHex: function(string){
var hex40CharRegex = /^[a-f0-9]{40}/i,
......
/*global GLOBE */
/*eslint camelcase: 0 */
/**
* default bridge detail object
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment