Permalink
Browse files

Revert "Changing HTML editor from jwysiwyg to redactor #815"

This reverts commit defc397.
  • Loading branch information...
1 parent defc397 commit e43271d6c79f317665fdc72361ec208d9e998dbc srutto committed Apr 17, 2013
View
0 .htaccess 100755 → 100644
No changes.
View
0 application/config/actions.php 100755 → 100644
No changes.
View
0 application/config/api.php 100755 → 100644
No changes.
View
No changes.
View
0 application/config/benchmark.php 100755 → 100644
No changes.
View
0 application/config/cache.php 100755 → 100644
No changes.
View
4 application/config/cdn.php 100755 → 100644
@@ -53,7 +53,7 @@
//
$config['cdn_gradual_upgrade'] = false;
-// Avoid XSS problems with redactor in CDN environments.
-$config['cdn_ignore_redactor'] = true;
+// Avoid XSS problems with jwysiwyg in CDN environments.
+$config['cdn_ignore_jwysiwyg'] = true;
?>
View
No changes.
View
0 application/config/cookie.php 100755 → 100644
No changes.
View
No changes.
View
0 application/config/email.php 100755 → 100644
No changes.
View
No changes.
View
0 application/config/globalcode.php 100755 → 100644
No changes.
View
0 application/config/image.php 100755 → 100644
No changes.
View
0 application/config/locale.php 100755 → 100644
No changes.
View
0 application/config/map.php 100755 → 100644
No changes.
View
No changes.
View
0 application/config/plugins.php 100755 → 100644
No changes.
View
No changes.
View
0 application/config/riverid.php 100755 → 100644
No changes.
View
0 application/config/routes.php 100755 → 100644
No changes.
View
0 application/config/session.php 100755 → 100644
No changes.
View
0 application/config/settings.php 100755 → 100644
No changes.
View
0 application/config/upload.php 100755 → 100644
No changes.
@@ -188,17 +188,17 @@ public function requirements()
Requirements::js("media/js/colorpicker.js");
}
- // Load redactor
+ // Load jwysiwyg
if ($this->editor_enabled)
{
- Requirements::css('media/js/redactor/redactor/redactor.css');
- if (Kohana::config("cdn.cdn_ignore_redactor") == TRUE)
+ Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
+ if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE)
{
- Requirements::js(url::file_loc('ignore').'media/js/redactor/redactor/redactor.min.js'); // not sure what the hell to do about this
+ Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
}
else
{
- Requirements::js('media/js/redactor/redactor/redactor.min.js');
+ Requirements::js('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js');
}
}
@@ -28,7 +28,7 @@ function fillFields(id, page_title, page_tab,
$("#page_tab").attr("value", decodeURIComponent(page_tab));
page_description = decodeURIComponent(escape($.base64.decode(page_description)));
$("#page_description").attr("value", decodeURIComponent(page_description));
- $("#page_description").redactor("setContent",decodeURIComponent(page_description));
+ $("#page_description").wysiwyg("setContent",decodeURIComponent(page_description));
}
// Ajax Submission
@@ -46,9 +46,9 @@ function pageAction ( action, confirmAction, id )
}
}
-//Load redactor editor
+//Load jwysiwyg editor
var hb_full ;
$(document).ready(function(){
- hb_full = $("#page_description").redactor();
+ hb_full = $("#page_description").wysiwyg();
});
@@ -1,9 +0,0 @@
-# Contributing
-
-I love pull-requests. However, this repo is just a mirror of [redactor-js official website](http://redactorjs.com/) hosted here for your, my dear GitHubbers, convenience.
-
-Thus, no pull-requests will be accepted.
-
-Issues on the other hand are a great tool to make the project authors aware of certain bugs or feature requests!
-
-Happy coding!
@@ -1,34 +0,0 @@
-redactor-js
-===========
-
-jQuery based WYSIWYG-editor, official author's website: http://redactorjs.com/
-
-This is a codebase mirror hosted here for your, my dear Githubbers', convenience!
-
-
-## Screenshot
-![Redactor in action](https://github.com/dybskiy/redactor-js/raw/master/redactor-js.png)
-
-## Authors
-
-#### Developers
-
-* Aleksey Baranov and Imperavi LLC. imperavi.com
-
-#### Optimization and improvement
-
-* Сергей Демчук sergiusd.ru
-* Павел Ясинский
-
-####Localization
-
-* Brazilian portuguese — Guilherme Gondim
-* Ukrainian — Ганич Тарас alexa-cms.com
-* Polish — Юрий Сладковский its.sladkowski.com
-* Latvian — Максим Солдатёнок maksold.com
-* German — Volodymyr Atapin
-
-## License
-Starting with version 7.6.2 redactor-js is licensed under [Creative Commons Attribution-NonCommercial 3.0 license](http://creativecommons.org/licenses/by-nc/3.0/)
-
-For commercial use please buy license here: http://redactorjs.com/download/ or use earlier version.
@@ -1,26 +0,0 @@
-html, body {
- margin: 0;
- padding: 0;
-}
-
-
-/* =Typography
------------------------------------------------------------------------------*/
-body {
- font-family: Helvetica, Arial, sans-serif;
- font-size: 14px;
-}
-
-
-/* =Layout
------------------------------------------------------------------------------*/
-#page {
- width: 940px;
- margin: 50px auto;
-}
-
-/* =Misc
------------------------------------------------------------------------------*/
-.list li {
- margin: 10px 0;
-}

Large diffs are not rendered by default.

Oops, something went wrong.
Deleted file not rendered
Oops, something went wrong.

0 comments on commit e43271d

Please sign in to comment.