Changeset 601

Timestamp:

04/21/09 21:02:04 (3 years ago)

Author:

jf.hovinne

Message:

Drupal integration: apply patch from sun.

Location:

trunk/src/apps/drupal/wysiwyg/editors

Files:

• js/wymeditor.js (modified) (3 diffs)
• wymeditor.inc (modified) (7 diffs)

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

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

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

@@ -3 +3 @@
 
 /**
- * Drupal WYMeditor integration using Wysiwyg API
- * http://drupal.org/project/wysiwyg
+ * @file
+ * Editor integration functions for WYMeditor.
  */
+
 
 /**
@@ -16 +17 @@
     'vendor url' => 'http://www.wymeditor.org/',
     'download url' => 'http://www.wymeditor.org/download/',
-    'library path' => wysiwyg_get_path('wymeditor'),
+    'library path' => wysiwyg_get_path('wymeditor/wymeditor'),
     'libraries' => array(
-      '' => array(
+      'pack' => array(
+        'title' => 'Packed',
+        'files' => array('jquery.wymeditor.pack.js'),
+      ),
+      'min' => array(
         'title' => 'Minified',
         'files' => array('jquery.wymeditor.min.js'),
@@ -26 +31 @@
         'files' => array('jquery.wymeditor.js'),
       ),
-      'pack' => array(
-        'title' => 'Packed',
-        'files' => array('jquery.wymeditor.pack.js'),
-      )
     ),
     'version callback' => 'wysiwyg_wymeditor_version',
@@ -52 +53 @@
  */
 function wysiwyg_wymeditor_version($editor) {
-  $script = wysiwyg_get_path('wymeditor') . '/jquery.wymeditor.js';
-  $script = fopen($script, 'r');
+  $library = $editor['library path'] . '/jquery.wymeditor.js';
+  if (!file_exists($library)) {
+    return;
+  }
+  $library = fopen($library, 'r');
   $max_lines = 200;
-  while ($max_lines && $line = fgets($script)) {
+  while ($max_lines && $line = fgets($library)) {
     if (strpos($line, 'VERSION             :') !== FALSE) {
       if (preg_match('@VERSION\s*:\s*"([0-9\.]+)@', $line, $version)) {
-        fclose($script);
+        fclose($library);
         return $version[1];
       }
@@ -64 +68 @@
     $max_lines--;
   }
-  fclose($script);
+  fclose($library);
 }
 
@@ -83 +87 @@
 function wysiwyg_wymeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'updateSelector' => ".form-submit",
-    'skin' => "compact"
+    'updateSelector' => '.form-submit',
+    'skin' => $theme,
   );
-  
-  // Set language if set in $config
+
   if (isset($config['language'])) {
     $settings['lang'] = $config['language'];
   }
 
-  // Add editor content stylesheet.
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
@@ -108 +110 @@
 }
 
+/**
+ * Determine available editor themes or check/reset a given one.
+ *
+ * @param $editor
+ *   A processed hook_editor() array of editor properties.
+ * @param $profile
+ *   A wysiwyg editor profile.
+ *
+ * @return
+ *   An array of theme names. The first returned name should be the default
+ *   theme name.
+ */
+function wysiwyg_wymeditor_themes($editor, $profile) {
+  return array('default', 'compact', 'minimal', 'silver', 'twopanels');
+}
+