Skip to content

Commit 5656f3e

Browse files
committed
Fixed path to js files + minor changes to js code to pass jshint.
1 parent 5b6c8cf commit 5656f3e

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

Gruntfile.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ module.exports = function (grunt) {
5656

5757
// Twitter Bootstrap
5858
'bower_components/bootstrap/js/modal.js',
59-
'bower_components/bootstrap/js/button.js',
6059
'bower_components/bootstrap/js/dropdown.js',
60+
'bower_components/bootstrap/js/button.js',
6161
'bower_components/bootstrap/js/tooltip.js',
6262
'bower_components/bootstrap/js/popover.js',
6363
//'bower_components/bootstrap/js/carousel.js',
@@ -155,25 +155,23 @@ module.exports = function (grunt) {
155155
jshint: {
156156
dev: [
157157

158-
// --- tools ---
159158
'Gruntfile.js',
160159
'package.json',
161160
'bower.json',
162161

163-
// --- dist ---
164-
'js/dom*.js',
162+
'js/dico/*.js',
165163
'js/i18n/EN.js',
166164

167-
'js/many*.js',
168-
'js/one*.js',
169-
'js/action-*.js',
165+
'js/view-many/many*.js',
166+
'js/view-one/one*.js',
167+
'js/view-action/action-*.js',
168+
'js/view-action/toolbar.js',
170169

171-
//'js/navbar.js',
172-
'js/toolbar.js',
170+
'ui-models/*.js',
173171

174-
// --- ui models ---
175-
'ui-models/*.js'
172+
'../demo/demo.js',
176173

174+
'!js/*/*-nogit.js'
177175
]
178176
},
179177

@@ -287,7 +285,7 @@ module.exports = function (grunt) {
287285
// *************************************************************************************
288286
// BUILD TASKS : dev prod demo dep
289287
// *************************************************************************************
290-
grunt.registerTask('default', ['prod', 'dep']);
288+
grunt.registerTask('default', ['prod']);
291289

292290
grunt.registerTask('dev', [
293291
'header:dev',

js/dico/dico.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ return {
232232
fieldLink: function (id, fld, value, icon, noLink, route) {
233233
var h='';
234234
if(!noLink){
235-
h+='<a href="'+(route?route:'javascript:void(0);');
235+
var js='javascript'; // necessary for jshint
236+
h+='<a href="'+(route?route:(js+':void(0);'));
236237
if(id){
237238
h+='" id="'+id;
238239
}

js/view-action/action-import.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ return Backbone.View.extend({
225225
h = JSON.stringify(sample, null, '\t');
226226
}else{
227227
var r=[];
228-
for (p in sample[0]){
228+
for (var p in sample[0]){
229229
r.push(p);
230230
}
231231
h += r.join(',');

js/view-one/one.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ return Backbone.View.extend({
226226
try{
227227
$f.select2('val', _.isString(fv)?[fv]:fv);
228228
}catch(e){
229-
console.error('error with select2')
229+
console.error('error with select2');
230230
return '';
231231
}
232232
break;

0 commit comments

Comments
 (0)