diff --git a/app/components/builds/item/index.js b/app/components/builds/item/index.js index b02483e..70f80e2 100644 --- a/app/components/builds/item/index.js +++ b/app/components/builds/item/index.js @@ -6,7 +6,7 @@ var _ = require('underscore'), ProjectActions = require('../../../actions/project'), BuildActions = require('../../../actions/build'), CommonComponents = require('../../common'), - utils = require('../../../utils'), + utils = require('../../../../lib/utils'), template = require('./index.jade'); var Component = React.createClass({ diff --git a/app/styles/index.less b/app/styles/index.less index 0a0094f..e98e31f 100644 --- a/app/styles/index.less +++ b/app/styles/index.less @@ -1,4 +1,4 @@ -/*@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700&subset=latin,cyrillic-ext);*/ +@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700&subset=latin,cyrillic-ext); @libPath: "../../node_modules"; diff --git a/app/utils.js b/app/utils.js deleted file mode 100644 index 16e43b9..0000000 --- a/app/utils.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -var utils = {}; - -utils.prune = function(str, length) { - var result = '', - words = str.split(' '); - - do { - result += words.shift() + ' '; - } while (words.length && result.length < length); - - return result.replace(/ $/, words.length ? '...' : ''); -}; - -module.exports = utils; diff --git a/lib/utils.js b/lib/utils.js index 3a47012..3c49e87 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,9 +1,6 @@ 'use strict'; -var _ = require('underscore'), - sharedUtils = require('../app/utils'); - -_(exports).extend(sharedUtils); +var _ = require('underscore'); exports.lpad = function(str, length, chr) { chr = chr || '0'; @@ -11,6 +8,17 @@ exports.lpad = function(str, length, chr) { return str; }; +exports.prune = function(str, length) { + var result = '', + words = str.split(' '); + + do { + result += words.shift() + ' '; + } while (words.length && result.length < length); + + return result.replace(/ $/, words.length ? '...' : ''); +}; + exports.toNumberStr = function(number) { return exports.lpad(String(number), 20); }; diff --git a/package.json b/package.json index c780971..4123717 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test": "npm run makeTestRepos && mocha --bail --reporter=spec --timeout 4000", "build-less": "lessc app/styles/index.less > static/css/index.css", "build-js": "browserify app/app.js -t ./transforms/jade.js | uglifyjs -mc > static/js/app.build.js", - "watch-less": "nodemon --ext less --watch app/styles --exec 'npm run less'", + "watch-less": "nodemon --ext less --watch app/styles --exec 'npm run build-less'", "watch-js": "watchify app/app.js -t ./transforms/jade.js -o static/js/app.build.js -dv", "watch-server": "nodemon --ignore app --ignore static --ignore node_modules --ignore data app.js", "dev": "npm run build-fonts && npm run watch-less & npm run watch-js & npm run watch-server",