summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/js/none.js6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 653dece..85eda70 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-2.x, xxxx-xx-xx
---------------------------
+#403728 by jfduchesneau: Fixed none.js breaks if textarea.js is not loaded.
#325657 by elgreg: Fixed blog form alteration must only apply to Blog module.
#454992 by sun: Fixed drupal_get_js() query string 'q' breaks plugin loading.
#419696 by sun: Fixed native plugins plugins are not loaded for all profiles.
diff --git a/editors/js/none.js b/editors/js/none.js
index 57660d5..106485b 100644
--- a/editors/js/none.js
+++ b/editors/js/none.js
@@ -17,15 +17,15 @@ Drupal.wysiwyg.editor.attach.none = function(context, params, settings) {
if (params.resizable) {
$('#' + params.field).addClass('resizable');
$('#' + params.field).css({display: ''});
- Drupal.textareaAttach();
+ if (Drupal.textareaAttach) {
+ Drupal.textareaAttach();
+ }
}
};
/**
* Detach a single or all editors.
*
- * See Drupal.wysiwyg.editor.attach.none() for a full desciption of arguments.
- *
* @param context
* A DOM element, supplied by Drupal.attachBehaviors().
* @param params