Merge branch 'master' of https://github.com/cosmocode/dokuwiki-plugin-imgpaste

# Conflicts:
#	plugin.info.txt

Author: fstorck

lang/fr/lang.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * French language file for imgpaste plugin
+ *
+ * @author Schplurtz le Déboulonné <[email protected]>
+ */
+
+$lang['e_nodata']         = 'Le presse-papier est vide.';
+$lang['js']['inprogress'] = 'Envoi en cours… Veuillez patienter.';
+
+//Setup VIM: ex: et ts=4 :

lang/fr/settings.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * French language file for imgpaste plugin
+ *
+ * @author Schplurtz le Déboulonné <[email protected]>
+ */
+
+// keys need to match the config setting name
+$lang['filename'] = 'Comment nommer les images collées. Vous pouvez utiliser les motifs @USER@, @NS@, @ID@, ansi que des formats de strftime. Imgpaste ajoutera automatiquement la bonne extension au nom du fichier.';
+
+//Setup VIM: ex: et ts=4 :

plugin.info.txt

@@ -1,7 +1,11 @@
 base   imgpaste
 author Andreas Gohr
 email  [email protected]
+<<<<<<< HEAD
 date   2016-09-20
+=======
+date   2017-09-24
+>>>>>>> 02d362229275b1bdd8bf705f313142c5ebef8a51
 name   imgpaste plugin
 desc   Add images via cut'n'paste in Chrome 
 url    http://www.dokuwiki.org/plugin:imgpaste

script.js

@@ -1,53 +1,67 @@
 /* DOKUWIKI:include jquery.paste_image_reader.js */
 
 jQuery(function () {
-    if (!jQuery('#wiki__text').length) return;
-
-    jQuery('html').pasteImageReader({
-        callback: function (x) {
-            console.log(x);
-
-            // create dialog
-            var offset = jQuery('.plugin_imagepaste').length * 20;
-            var $box = jQuery('<div><div class="content">' + LANG.plugins.imgpaste.inprogress + '</div></div>');
-            $box.dialog({
-                title: 'Upload',
-                dialogClass: 'plugin_imagepaste',
-                closeOnEscape: false,
-                resizable: false,
-                position: {
-                    my: 'center+' + offset + ' center+' + offset
-                },
-                appendTo: '.dokuwiki'
-            });
-
-            // upload via AJAX
-            jQuery.ajax({
-                url: DOKU_BASE + 'lib/exe/ajax.php',
-                type: 'POST',
-                data: {
-                    call: 'plugin_imgpaste',
-                    data: x.dataURL,
-                    id: JSINFO.id
-                },
-
-                // insert syntax and close dialog
-                success: function (data) {
-                    $box.find('.content').addClass('success').text(data.message);
-                    insertAtCarret('wiki__text', '{{:' + data.id + '}}');
-                    $box.delay(500).fadeOut(500, function () {
-                        $box.dialog('destroy').remove()
-                    });
-                },
-
-                // display error and close dialog
-                error: function (xhr, status, error) {
-                    $box.find('.content').addClass('error').text(error);
-                    $box.delay(1000).fadeOut(500, function () {
-                        $box.dialog('destroy').remove()
-                    });
-                }
-            });
+    var _didInit = false;
+    function init() {
+        if (!jQuery('#wiki__text').length || _didInit) return;
+        _didInit = true;
+        jQuery('html').pasteImageReader({
+            callback: function (x) {
+                if (!jQuery('#wiki__text').length) return;
+
+                console.log(x);
+
+                // create dialog
+                var offset = jQuery('.plugin_imagepaste').length * 20;
+                var $box = jQuery('<div><div class="content">' + LANG.plugins.imgpaste.inprogress + '</div></div>');
+                $box.dialog({
+                    title: 'Upload',
+                    dialogClass: 'plugin_imagepaste',
+                    closeOnEscape: false,
+                    resizable: false,
+                    position: {
+                        my: 'center+' + offset + ' center+' + offset
+                    },
+                    appendTo: '.dokuwiki'
+                });
+
+                // upload via AJAX
+                jQuery.ajax({
+                    url: DOKU_BASE + 'lib/exe/ajax.php',
+                    type: 'POST',
+                    data: {
+                        call: 'plugin_imgpaste',
+                        data: x.dataURL,
+                        id: JSINFO.id
+                    },
+
+                    // insert syntax and close dialog
+                    success: function (data) {
+                        $box.find('.content').addClass('success').text(data.message);
+                        insertAtCarret('wiki__text', '{{:' + data.id + '}}');
+                        $box.delay(500).fadeOut(500, function () {
+                            $box.dialog('destroy').remove()
+                        });
+                    },
+
+                    // display error and close dialog
+                    error: function (xhr, status, error) {
+                        $box.find('.content').addClass('error').text(error);
+                        $box.delay(1000).fadeOut(500, function () {
+                            $box.dialog('destroy').remove()
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    init();
+
+    // fastwiki plugin support
+    jQuery(window).on('fastwiki:afterSwitch', function(evt, viewMode, isSectionEdit, prevViewMode) {
+        if (viewMode == 'edit' || isSectionEdit) {
+            init();
         }
     });
-});
+});