Changeset 598

Timestamp:

04/20/09 22:39:08 (3 years ago)

Author:

jf.hovinne

Message:

Improved Drupal integration: get language from profile, improve detach().

Location:

trunk/src/apps/drupal/wysiwyg/editors

Files:

• js/wymeditor.js (modified) (2 diffs)
• wymeditor.inc (modified) (2 diffs)

trunk/src/apps/drupal/wysiwyg/editors/js/wymeditor.js

@@ -1 +1 @@
 // $Id$
-
-/**
- * Drupal WYMeditor integration using Wysiwyg API
- * http://drupal.org/project/wysiwyg
- */
 
 /**
@@ -18 +13 @@
  */
 Drupal.wysiwyg.editor.detach.wymeditor = function(context, params) {
-  var $field = $('#' + params.field);
-  var editor = $field.next().data(WYMeditor.WYM_INDEX);
-  if (typeof editor != 'undefined') {
-    WYMeditor.INSTANCES[editor].update();
-    $field.next().remove();
+  if (typeof params != 'undefined') {
+    var $field = $('#' + params.field);
+    var editor = $field.next().data(WYMeditor.WYM_INDEX);
+    if (typeof editor != 'undefined') {
+      WYMeditor.INSTANCES[editor].update();
+      $field.next().remove();
+    }
+    $field.show();
+  } else {
+    jQuery.each( WYMeditor.INSTANCES, function() {
+      this.update();
+      $(this._box).prev().show().end().remove();
+    });
   }
-  $field.show();
 };
 

trunk/src/apps/drupal/wysiwyg/editors/wymeditor.inc

@@ -2 +2 @@
 // $Id$
 
-/**
- * Drupal WYMeditor integration using Wysiwyg API
- * http://drupal.org/project/wysiwyg
- */
 
 /**
@@ -83 +79 @@
 function wysiwyg_wymeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'lang' => $GLOBALS['language']->language,
     'updateSelector' => ".form-submit",
     'skin' => "compact"
   );
+  
+  // Set language if set in $config
+  if (isset($config['language'])) {
+    $settings['lang'] = $config['language'];
+  }
 
   // Add editor content stylesheet.