diff --git a/app/js/directives/directive-area-chart.js b/app/js/directives/directive-area-chart.js index 556c5e3d..765a5127 100755 --- a/app/js/directives/directive-area-chart.js +++ b/app/js/directives/directive-area-chart.js @@ -10,7 +10,6 @@ angular.module('app').directive('areaChart', function () { width: '=' }, link: function(scope, element) { - console.log(element[0].parentElement); var width = element[0].parentElement.offsetWidth, height = width * 0.6, series = scope.series, diff --git a/app/js/directives/directive-component-select.js b/app/js/directives/directive-component-select.js index 886ebe71..038d93ea 100755 --- a/app/js/directives/directive-component-select.js +++ b/app/js/directives/directive-component-select.js @@ -2,7 +2,7 @@ angular.module('app').directive('componentSelect', function () { // Generting the HTML in this manner is MUCH faster than using an angular template. - function appendGroup(list, opts, cid, mass, wrap) { + function appendGroup(list, opts, cid, mass) { var prevClass = null, prevRating = null; for (var i = 0; i < opts.length; i++) { var o = opts[i]; @@ -47,8 +47,7 @@ angular.module('app').directive('componentSelect', function () { opts: '=', // Component Options object groups: '=', // Groups of Component Options mass: '=', // Current ship unladen mass - s: '=', // Current Slot - wrap: '@' // Wrap on class + s: '=' // Current Slot }, link: function(scope, element) { var list = []; @@ -57,7 +56,6 @@ angular.module('app').directive('componentSelect', function () { var opts = scope.opts; var groups = scope.groups; var mass = scope.mass || 0; - var wrap = scope.wrap; if(groups) { // At present time slots with grouped options (Hardpoints and Internal) can be empty @@ -66,12 +64,12 @@ angular.module('app').directive('componentSelect', function () { var grp = groups[g]; var grpCode = grp[Object.keys(grp)[0]].grp; // Nasty operation to get the grp property of the first/any single component list.push('
', g, '
'); } } else { list.push(''); } diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index 0fbe3802..0c4521a4 100755 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -92,7 +92,7 @@
Opt: {{th.c.optmass}} T
Max: {{th.c.maxmass}} T
-
+
diff --git a/gulpfile.js b/gulpfile.js index 84622a37..934428e4 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -209,7 +209,7 @@ gulp.task('build', function (done) { runSequence('clean', ['html2js','jsonToDB'] gulp.task('deploy', function (done) { cdnHostStr = '//cdn.' + process.env.CORIOLIS_HOST; - runSequence('build','cache-bust', 'upload', done); + runSequence('lint', 'build','cache-bust', 'upload', done); }); gulp.task('dev', function (done) { runSequence('build', 'serve','watch', done); }); gulp.task('default', ['dev']); diff --git a/package.json b/package.json index 5d79f48e..d84357da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "0.7.3", + "version": "0.7.4", "repository": { "type": "git", "url": "https://github.com/cmmcleod/coriolis"