Merge pull request #474 from moscoquera/master

json output for ckeditor drag&drop

Author: streamtw

src/controllers/UploadController.php

@@ -189,6 +189,15 @@ private function useFile($new_filename)
     {
         $file = parent::getFileUrl($new_filename);
 
+        $responseType=request()->input('responseType');
+        if ($responseType && $responseType=='json') {
+            return [
+                "uploaded"=> 1,
+                "fileName"=> $new_filename,
+                "url"=> $file,
+            ];
+        }
+
         return "<script type='text/javascript'>
 
         function getUrlParam(paramName) {