Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Fix up ember-cli generated files and misc jscs/jshint errors

Browse source
This commit is contained in:
Jason Williams 2015-02-18 18:11:42 -06:00 committed by Matt Enlow
parent 184da01702
commit e492c43067
5 changed files with 60 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gruntfile.js
View file

@ -116,7 +116,8 @@ var _ = require('lodash'),
'!core/client/bower_components/**/*.js',
'!core/client/tmp/**/*.js',
'!core/client/dist/**/*.js',
'!core/client/vendor/**/*.js'
'!core/client/vendor/**/*.js',
'!core/client/app/docs/**/*.js'
],
server: [
@ -148,7 +149,8 @@ var _ = require('lodash'),
'!core/client/bower_components/**/*.js',
'!core/client/tmp/**/*.js',
'!core/client/dist/**/*.js',
'!core/client/vendor/**/*.js'
'!core/client/vendor/**/*.js',
'!core/client/app/docs/**/*.js'
]
}
},

9
core/client/Brocfile.js
View file

@ -1,12 +1,11 @@
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
var EmberApp = require('ember-cli/lib/broccoli/ember-app'),
var app = new EmberApp(
{
app = new EmberApp({
hinting: false,
sourcemaps: {enabled: false} // see https://github.com/ember-cli/ember-cli/issues/2912
}
);
});
app.import('bower_components/loader.js/loader.js');
app.import('bower_components/jquery/dist/jquery.js');

2
core/client/config/environment.js
View file

@ -1,4 +1,5 @@
/* jshint node: true */
/* jscs:disable disallowEmptyBlocks */
module.exports = function (environment) {
var ENV = {
@ -40,7 +41,6 @@ module.exports = function(environment) {
}
if (environment === 'production') {
}
return ENV;

8
core/client/tests/helpers/start-app.js
View file

@ -3,10 +3,10 @@ import Application from '../../app';
import Router from '../../router';
import config from '../../config/environment';
export default function startApp(attrs) {
var application;
function startApp(attrs) {
var application,
attributes = Ember.merge({}, config.APP);
var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(function () {
@ -17,3 +17,5 @@ export default function startApp(attrs) {
return application;
}
export default startApp;