diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:15:23 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:15:23 +0200 |
| commit | 35200e5f1b10cdd18af8f0ea646996e438b97011 (patch) | |
| tree | e29804fad16e1958ce0852da58be25354d9a1f1c /view/tpl | |
| parent | 7e2635adfe2d20545d3a699c6fc14552c01a35a9 (diff) | |
| parent | 091ef33f18e4c9af8980ef1e8a4513c40e58b4b3 (diff) | |
| download | volse-hubzilla-35200e5f1b10cdd18af8f0ea646996e438b97011.tar.gz volse-hubzilla-35200e5f1b10cdd18af8f0ea646996e438b97011.tar.bz2 volse-hubzilla-35200e5f1b10cdd18af8f0ea646996e438b97011.zip | |
Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC
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'); |