Skip to content
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.

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

Redactor 3 #886

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ group :development, :test do
gem "kaminari", "~> 1.1.1"
gem "puma", "~> 3.12.2"
gem "rubocop", "~> 0.55.0", require: false
gem "selenium-webdriver", "~> 3.9.0"
gem "sqlite3", "~> 1.4.2"
gem "webdrivers", "~> 4.1.0"
gem "selenium-webdriver", "~> 3.9.0"
end

group :development do
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ Twitter: [@GroceryBagHead](https://twitter.com/grocerybaghead)

Thanks to [Roman Almeida](https://github.com/nasmorn) for contributing OEM License for [Redactor Text Editor](http://imperavi.com/redactor)

Thanks to [Bichinger Software & Consulting](https://www.bichinger.de) for contributing OEM License upgrade to [Redactor 3](http://imperavi.com/redactor)

[![Bichinger Software & Consulting](doc/bichinger_logo.png)](https://www.bichinger.de)

---

Copyright 2010-2019 Oleg Khabarov. Released under the [MIT license](LICENSE)
10 changes: 5 additions & 5 deletions app/assets/javascripts/comfy/admin/cms/wysiwyg.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
fileManagerJson.searchParams.set('source', 'redactor');
fileManagerJson.searchParams.set('type', 'file');

const definedLinks = new URL(pagesPath, document.location.href);
definedLinks.searchParams.set('source', 'redactor');
const definedlinks = new URL(pagesPath, document.location.href);
definedlinks.searchParams.set('source', 'redactor');

return {
minHeight: 160,
Expand All @@ -39,7 +39,7 @@
imageManagerJson,
fileUpload,
fileManagerJson,
definedLinks
definedlinks: definedlinks.toString()
};
};

Expand All @@ -50,12 +50,12 @@
if (textareas.length === 0) return;
const redactorOptions = buildRedactorOptions();
for (const textarea of textareas) {
redactorInstances.push(new jQuery.Redactor(textarea, redactorOptions));
redactorInstances.push(new $R(textarea, redactorOptions));
}
},
dispose() {
for (const redactor of redactorInstances) {
redactor.core.destroy();
redactor.app.stop();
}
redactorInstances.length = 0;
}
Expand Down
Loading