From 7039695b65d45edcfb516482c123f099012faf0f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 14 Oct 2015 21:46:18 +0100
Subject: [PATCH] Added chrome paste-image-upload. Closes #20.

---
 app/Http/Controllers/ImageController.php |  11 ++--
 public/loading.gif                       | Bin 0 -> 11098 bytes
 resources/assets/js/pages/page-form.js   |  62 ++++++++++++++++++++++-
 resources/views/pages/create.blade.php   |   1 +
 resources/views/pages/edit.blade.php     |   1 +
 resources/views/pages/form.blade.php     |   2 -
 6 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 public/loading.gif

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index dc49418..df4f554 100644
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\Facades\Auth;
 use Intervention\Image\Facades\Image as ImageTool;
 use Illuminate\Support\Facades\DB;
-use BookStack\Http\Requests;
 use BookStack\Image;
 use BookStack\Repos\PageRepo;
 
@@ -37,13 +36,13 @@ public function __construct(Image $image, File $file)
     public function getAll($page = 0)
     {
         $pageSize = 30;
-        $images = DB::table('images')->orderBy('created_at', 'desc')
+        $images = $this->image->orderBy('created_at', 'desc')
             ->skip($page * $pageSize)->take($pageSize)->get();
         foreach ($images as $image) {
             $image->thumbnail = $this->getThumbnail($image, 150, 150);
         }
-        $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
-                ->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;
+        $hasMore = $this->image->orderBy('created_at', 'desc')
+                ->skip(($page + 1) * $pageSize)->take($pageSize)->count() > 0;
         return response()->json([
             'images'  => $images,
             'hasMore' => $hasMore
@@ -105,8 +104,8 @@ public function upload(Request $request)
         // Create and save image object
         $this->image->name = $name;
         $this->image->url = $imagePath . $storageName;
-        $this->image->created_by = Auth::user()->id;
-        $this->image->updated_by = Auth::user()->id;
+        $this->image->created_by = auth()->user()->id;
+        $this->image->updated_by = auth()->user()->id;
         $this->image->save();
         $this->image->thumbnail = $this->getThumbnail($this->image, 150, 150);
         return response()->json($this->image);
diff --git a/public/loading.gif b/public/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5bcdebec3069f64d0be4edc0879a67641c0d9ae4
GIT binary patch
literal 11098
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

literal 0
HcmV?d00001

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index de53a49..d3b18df 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -9,11 +9,13 @@ module.exports = {
     relative_urls: false,
     statusbar: false,
     menubar: false,
+    paste_data_images: false,
     //height: 700,
     extended_valid_elements: 'pre[*]',
+    automatic_uploads: false,
     valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
     plugins: "image table textcolor paste link imagetools fullscreen code hr",
-    toolbar: "code undo | styleselect | hr bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",
+    toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link hr | code fullscreen",
     content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
     style_formats: [
         {title: "Header 1", format: "h1"},
@@ -22,7 +24,8 @@ module.exports = {
         {title: "Header 4", format: "h4"},
         {title: "Paragraph", format: "p"},
         {title: "Blockquote", format: "blockquote"},
-        {title: "Code Block", icon: "code", format: "pre"}
+        {title: "Code Block", icon: "code", format: "pre"},
+        {title: "Inline Code", icon: "code", inline: "code"}
     ],
     file_browser_callback: function(field_name, url, type, win) {
         ImageManager.show(function(image) {
@@ -35,5 +38,60 @@ module.exports = {
                 win.document.getElementById(field_name).fireEvent("onchange");
             }
         });
+    },
+    paste_preprocess: function(plugin, args) {
+        var content = args.content;
+        if(content.indexOf('<img src="file://') !== -1) {
+            args.content = '';
+        }
+    },
+    setup: function(editor) {
+        // Paste image-uploads
+        editor.on('paste', function(e) {
+            if(e.clipboardData) {
+                var items = e.clipboardData.items;
+                if (items){
+                    for (var i = 0; i < items.length; i++) {
+                        if (items[i].type.indexOf("image") !== -1) {
+
+                            var file = items[i].getAsFile();
+                            var formData = new FormData();
+                            var ext = 'png';
+                            var xhr = new XMLHttpRequest();
+
+                            if (file.name) {
+                                var fileNameMatches = file.name.match(/\.(.+)$/);
+                                if (fileNameMatches) {
+                                    ext = fileNameMatches[1];
+                                }
+                            }
+
+                            var id = "image-" + Math.random().toString(16).slice(2);
+                            editor.execCommand('mceInsertContent', false, '<img src="/loading.gif" id="'+id+'">');
+
+                            var remoteFilename = "image-" + Date.now() + "." + ext;
+                            formData.append('file', file, remoteFilename);
+                            formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content'));
+
+                            xhr.open('POST', '/upload/image');
+                            xhr.onload = function() {
+                                if (xhr.status === 200 || xhr.status === 201) {
+                                    var result = JSON.parse(xhr.responseText);
+                                    //var newImage =  editor.getDoc().getElementById(id);
+                                    //newImage.setAttribute('src', result.url);
+                                    editor.dom.setAttrib(id, 'src', result.url);
+                                    console.log(result);
+                                } else {
+                                    console.log('An error occured uploading the image');
+                                    console.log(xhr.responseText);
+                                }
+                            };
+                            xhr.send(formData);
+                        }
+                    }
+                }
+
+            }
+        });
     }
 };
\ No newline at end of file
diff --git a/resources/views/pages/create.blade.php b/resources/views/pages/create.blade.php
index ad635b2..62a8c39 100644
--- a/resources/views/pages/create.blade.php
+++ b/resources/views/pages/create.blade.php
@@ -16,4 +16,5 @@
             @endif
         </form>
     </div>
+    <image-manager></image-manager>
 @stop
\ No newline at end of file
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index bf56a14..937e41a 100644
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -14,5 +14,6 @@
             @include('pages/form', ['model' => $page])
         </form>
     </div>
+    <image-manager></image-manager>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index de88dec..ab5a0a4 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -35,5 +35,3 @@
         @endif
     </div>
 </div>
-
-<image-manager></image-manager>
\ No newline at end of file