Skip to content

Use SCSS import vs sprockets require for compatibility with bourbon #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use SCSS import vs sprockets require for compatibility with bourbon #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01dd8db
Use SCSS import vs sprockets require for compatibility with bourbon a…
terracatta Dec 7, 2013
8a2d320
Ensure we use the right turbolinks event binding
terracatta Dec 9, 2013
b542a9a
Update redactor to version 9.1.7
terracatta Dec 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/generators/redactor/templates/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
$(document).ready(
function(){
window.init_redactor = function(){
var csrf_token = $('meta[name=csrf-token]').attr('content');
var csrf_param = $('meta[name=csrf-param]').attr('content');
var params;
Expand All @@ -9,9 +8,15 @@ $(document).ready(
$('.redactor').redactor(
{ "imageUpload":"/redactor_rails/pictures?" + params,
"imageGetJson":"/redactor_rails/pictures",
"fileUpload":"/redactor_rails/documents?" + params,
"fileGetJson":"/redactor_rails/documents",
"path":"/assets/redactor-rails",
"css":"style.css"}
);
}

$(document).ready(function(){
window.init_redactor();
});

$(window).bind('page:load',function(){
window.init_redactor();
});
1 change: 1 addition & 0 deletions vendor/assets/javascripts/redactor-rails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= require redactor-rails/index
9 changes: 7 additions & 2 deletions vendor/assets/javascripts/redactor-rails/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@ window.init_redactor = function(){
);
}

$(document).ready( window.init_redactor );
$(window).bind('page:change', window.init_redactor);
$(document).ready(function(){
window.init_redactor();
});

$(window).bind('page:load',function(){
window.init_redactor();
});
Loading