diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-27 15:27:52 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-27 15:27:52 -0700 |
| commit | 38c2070aabf590d90ccd854e0542affe2ca6a2a2 (patch) | |
| tree | ed96858870025eeff1737f8f9cfaeadca2061d02 /view/tpl | |
| parent | a0f28708ab125e953157299d13d8ebbea8b77396 (diff) | |
| parent | ec3a066e4e94ad7c72d1d07371081318a4d5e9ab (diff) | |
| download | volse-hubzilla-38c2070aabf590d90ccd854e0542affe2ca6a2a2.tar.gz volse-hubzilla-38c2070aabf590d90ccd854e0542affe2ca6a2a2.tar.bz2 volse-hubzilla-38c2070aabf590d90ccd854e0542affe2ca6a2a2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 365a922f9..dd64c3454 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -97,6 +97,7 @@ var activeCommentText = ''; $('#invisible-comment-upload').fileupload({ url: 'wall_attach/{{$nickname}}', dataType: 'json', + dropZone: $(), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { @@ -482,10 +483,13 @@ var activeCommentText = ''; } - // file drag hover - function DragDropUploadFileHover(e) { - e.target.className = (e.type == "dragover" ? "hover" : ""); - } + // file drag hover + function DragDropUploadFileHover(e) { + if(e.type == 'dragover') + $(e.target).addClass('hover'); + else + $(e.target).removeClass('hover'); + } // file selection function DragDropUploadFileSelectHandler(e) { @@ -494,7 +498,7 @@ var activeCommentText = ''; DragDropUploadFileHover(e); // open editor if it isn't yet initialised if (!editor) { - initEditor(); + enableOnUser(); } linkdrop(e); @@ -586,7 +590,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del openEditor = true; } if(openEditor) { - initEditor(); + enableOnUser(); } } else { postSaveChanges('clean'); |