Skip to content

Commit e9cb54b

Browse files
committed
Merge pull request Nerian#38 from roymax/master
supported config.assets.prefix option
2 parents ffd68fd + 96adc86 commit e9cb54b

File tree

1 file changed

+2
-2
lines changed
  • vendor/assets/javascripts/bootstrap-wysihtml5

1 file changed

+2
-2
lines changed

vendor/assets/javascripts/bootstrap-wysihtml5/core.js renamed to vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
return methods.init.apply( this, arguments );
348348
} else {
349349
$.error( 'Method ' + method + ' does not exist on jQuery.wysihtml5' );
350-
}
350+
}
351351
};
352352

353353
$.fn.wysihtml5.Constructor = Wysihtml5;
@@ -414,7 +414,7 @@
414414
"div": 1
415415
}
416416
},
417-
stylesheets: ["/assets/bootstrap-wysihtml5/wysiwyg-color.css"], // (path_to_project/lib/css/wysiwyg-color.css)
417+
stylesheets: ["#{Rails.configuration.assets.prefix}/bootstrap-wysihtml5/wysiwyg-color.css"], // (path_to_project/lib/css/wysiwyg-color.css)
418418
locale: "en"
419419
};
420420

0 commit comments

Comments
 (0)