Implemented image selector dialog for TinyMCE, css fixes in classic skin for TinyMCE4

5 files changed, 199 insertions, 16 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index e297b24bc..ef63db9da 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1799,6 +1799,7 @@ class rcmail extends rcube
             'spelldict'  => intval($this->config->get('spellcheck_dictionary'))
         ));
 
+        $this->output->add_label('selectimage', 'addimage');
         $this->output->include_script('tinymce/tinymce.min.js');
         $this->output->include_script('editor.js');
         $this->output->add_script("rcmail_editor_init($script)", 'docready');
diff --git a/program/js/app.js b/program/js/app.js
index 43dba1402..b0b2cb15c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -539,12 +539,12 @@ function rcube_webmail()
 
     // execute all foreign onload scripts
     // @deprecated
-    for (var i in this.onloads) {
-      if (typeof this.onloads[i] === 'string')
-        eval(this.onloads[i]);
-      else if (typeof this.onloads[i] === 'function')
-        this.onloads[i]();
-      }
+    for (n in this.onloads) {
+      if (typeof this.onloads[n] === 'string')
+        eval(this.onloads[n]);
+      else if (typeof this.onloads[n] === 'function')
+        this.onloads[n]();
+    }
 
     // start keep-alive and refresh intervals
     this.start_refresh();
@@ -4010,6 +4010,9 @@ function rcube_webmail()
   // called from upload page
   this.add2attachment_list = function(name, att, upload_id)
   {
+    if (upload_id)
+      this.triggerEvent('fileuploaded', {name: name, attachment: att, id: upload_id});
+
     if (!this.gui_objects.attachmentlist)
       return false;
 
diff --git a/program/js/editor.js b/program/js/editor.js
index 014f61e1c..91e8c6d75 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -29,7 +29,6 @@ function rcmail_editor_init(config)
       relative_urls: false,
       remove_script_host: false,
       convert_urls: false, // #1486944
-      image_list: window.rcmail_editor_images,
       image_description: false,
       paste_webkit_style: "color font-size font-family",
       paste_data_images: true
@@ -52,7 +51,10 @@ function rcmail_editor_init(config)
       spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
       spellchecker_enable_learn_rpc: config.spelldict, //TODO
       spellchecker_language: rcmail.env.spell_lang,
-      accessibility_focus: false
+      accessibility_focus: false,
+      file_browser_callback: rcmail_file_browser_callback,
+      // @todo: support more than image (types: file, image, media)
+      file_browser_callback_types: 'image'
     });
 
     conf.setup = function(ed) {
@@ -150,17 +152,151 @@ function rcmail_toggle_editor(select, textAreaId)
   }
 }
 
-// editor callback for images listing
-function rcmail_editor_images(callback)
+// image selector
+function rcmail_file_browser_callback(field_name, url, type, win)
 {
-  var i, file, list = [];
+  var i, elem, dialog, list = [], editor = tinyMCE.activeEditor;
 
+  // open image selector dialog
+  dialog = editor.windowManager.open({
+    title: rcmail.gettext('select' + type),
+    width: 500,
+    height: 300,
+    html: '<div id="image-selector-list"><ul></ul></div>'
+      + '<div id="image-selector-form"><div id="image-upload-button" class="mce-widget mce-btn" role="button"></div></div>',
+    buttons: [{text: 'Cancel', onclick: function() { rcmail_file_browser_close(); }}]
+  });
+
+  rcmail.env.file_browser_field = field_name;
+  rcmail.env.file_browser_type = type;
+
+  // fill images list with available images
   for (i in rcmail.env.attachments) {
-    file = rcmail.env.attachments[i];
-    if (file.complete && file.mimetype.startsWith('image/')) {
-      list.push({title: file.name, value: rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+i});
+    if (elem = rcmail_file_browser_entry(i, rcmail.env.attachments[i])) {
+      list.push(elem);
     }
   }
 
-  callback(list);
+  if (list.length) {
+    $('#image-selector-list > ul').append(list);
+  }
+
+  // add hint about max file size (in dialog footer)
+  $('div.mce-abs-end', dialog.getEl()).append($('<div class="hint">').text($('#uploadform div.hint').text()));
+
+  // enable (smart) upload button
+  elem = $('#image-upload-button').append($('<span>').text(rcmail.gettext('add' + type)));
+  hack_file_input(elem, rcmail.gui_objects.uploadform);
+
+  // enable drag-n-drop area
+  if (rcmail.gui_objects.filedrop && rcmail.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) || window.FormData)) {
+    rcmail.env.old_file_drop = rcmail.gui_objects.filedrop;
+    rcmail.gui_objects.filedrop = $('#image-selector-form');
+    rcmail.gui_objects.filedrop.addClass('droptarget')
+      .bind('dragover dragleave', function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        $(this)[(e.type == 'dragover' ? 'addClass' : 'removeClass')]('hover');
+      })
+      .get(0).addEventListener('drop', function(e) { return rcmail.file_dropped(e); }, false);
+  }
+
+  // register handler for successful file upload
+  if (!rcmail.env.file_dialog_event) {
+    rcmail.env.file_dialog_event = true;
+    rcmail.addEventListener('fileuploaded', function(attr) {
+      var elem;
+      if (elem = rcmail_file_browser_entry(attr.name, attr.attachment)) {
+        $('#image-selector-list > ul').prepend(elem);
+      }
+    });
+  }
+}
+
+// close file browser window
+function rcmail_file_browser_close(url)
+{
+  if (url)
+    $('#' + rcmail.env.file_browser_field).val(url);
+
+  tinyMCE.activeEditor.windowManager.close();
+
+  if (rcmail.env.old_file_drop)
+    rcmail.gui_objects.filedrop = rcmail.env.old_file_drop;
+}
+
+// creates file browser entry
+function rcmail_file_browser_entry(file_id, file)
+{
+  if (!file.complete || !file.mimetype) {
+    return;
+  }
+
+  if (file.mimetype.startsWith('image/')) {
+    var href = rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+file_id,
+      img = $('<img>').attr({title: file.name, src: href + '&_thumbnail=1'});
+
+    return $('<li>').data('url', href)
+      .append($('<span class="img">').append(img))
+      .append($('<span class="name">').text(file.name))
+      .click(function() { rcmail_file_browser_close($(this).data('url')); });
+  }
+}
+
+// create smart files upload button
+function hack_file_input(elem, clone_form)
+{
+  var link = $(elem),
+    file = $('<input>'),
+    form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'}),
+    offset = link.offset();
+
+  // clone existing upload form
+  if (clone_form) {
+    file.attr('name', $('input[type="file"]', clone_form).attr('name'));
+    form.attr('action', $(clone_form).attr('action'))
+      .append($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
+  }
+
+  function move_file_input(e) {
+    file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
+  }
+
+  file.attr({type: 'file', multiple: 'multiple', size: 5, title: ''})
+    .change(function() { rcmail.upload_file(form, 'upload'); })
+    .click(function() { setTimeout(function() { link.mouseleave(); }, 20); })
+    // opacity:0 does the trick, display/visibility doesn't work
+    .css({opacity: 0, cursor: 'pointer', position: 'relative', outline: 'none'})
+    .appendTo(form);
+
+  // In FF and IE we need to move the browser file-input's button under the cursor
+  // Thanks to the size attribute above we know the length of the input field
+  if (navigator.userAgent.match(/Firefox|MSIE/))
+    file.css({marginLeft: '-80px'});
+
+  // Note: now, I observe problem with cursor style on FF < 4 only
+  link.css({overflow: 'hidden', cursor: 'pointer'})
+    .mouseenter(function() { this.__active = true; })
+    // place button under the cursor
+    .mousemove(function(e) {
+      if (this.__active)
+        move_file_input(e);
+      // move the input away if button is disabled
+      else
+        $(this).mouseleave();
+    })
+    .mouseleave(function() {
+      file.css({top: '-10000px', left: '-10000px'});
+      this.__active = false;
+    })
+    .click(function(e) {
+      // forward click if mouse-enter event was missed
+      if (!this.__active) {
+        this.__active = true;
+        move_file_input(e);
+        file.trigger(e);
+      }
+    })
+    .mouseleave()
+    .append(form);
 }
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 61890a642..4b1efb5eb 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -226,6 +226,8 @@ $labels['returnreceipt']  = 'Return receipt';
 $labels['dsn']            = 'Delivery status notification';
 $labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Original Message';
+$labels['selectimage']    = 'Select image';
+$labels['addimage']       = 'Add image';
 
 $labels['editidents']    = 'Edit identities';
 $labels['spellcheck']    = 'Spell';
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 85bc36cac..c8b7f9517 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -60,7 +60,7 @@ if ($RCMAIL->action=='remove-attachment') {
     exit;
 }
 
-if ($RCMAIL->action=='display-attachment') {
+if ($RCMAIL->action == 'display-attachment') {
     $id = 'undefined';
 
     if (preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs)) {
@@ -76,6 +76,47 @@ if ($RCMAIL->action=='display-attachment') {
             $attachment['size'] = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
         }
 
+        // generate image thumbnail for file browser in HTML editor
+        if (!empty($_GET['_thumbnail'])) {
+            $temp_dir       = $RCMAIL->config->get('temp_dir');
+            $thumbnail_size = 80;
+            list(,$ext)     = explode('/', $attachment['mimetype']);
+            $mimetype       = $attachment['mimetype'];
+            $file_ident     = $attachment['id'] . ':' . $attachment['mimetype'] . ':' . $attachment['size'];
+            $cache_basename = $temp_dir . '/' . md5($file_ident . ':' . $RCMAIL->user->ID . ':' . $thumbnail_size);
+            $cache_file     = $cache_basename . '.' . $ext;
+
+            // render thumbnail image if not done yet
+            if (!is_file($cache_file)) {
+                if (!$attachment['path']) {
+                    $orig_name = $filename = $cache_basename . '.orig.' . $ext;
+                    file_put_contents($orig_name, $attachment['data']);
+                }
+                else {
+                    $filename = $attachment['path'];
+                }
+
+                $image = new rcube_image($filename);
+                if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) {
+                    $mimetype = 'image/' . $imgtype;
+
+                    if ($orig_name) {
+                        unlink($orig_name);
+                    }
+                }
+            }
+
+            if (is_file($cache_file)) {
+                // cache for 1h
+                $RCMAIL->output->future_expire_header(3600);
+                header('Content-Type: ' . $mimetype);
+                header('Content-Length: ' . filesize($cache_file));
+
+                readfile($cache_file);
+                exit;
+            }
+        }
+
         header('Content-Type: ' . $attachment['mimetype']);
         header('Content-Length: ' . $attachment['size']);