diff options
| author | friendica <info@friendica.com> | 2015-03-10 12:23:51 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-10 12:23:51 -0700 |
| commit | e0ba373147cb4f3ea352ee58293e3ce9f1e19b1d (patch) | |
| tree | 551f05c5344e3cd9cd885606042361a73339c292 /view/tpl/jot-header.tpl | |
| parent | 54a9fb1774a256a0f61bc7a8a9ffdcee83b9895b (diff) | |
| parent | 637f0eba4f7f3c9a0cbffc0629634116b17fdeab (diff) | |
| download | volse-hubzilla-e0ba373147cb4f3ea352ee58293e3ce9f1e19b1d.tar.gz volse-hubzilla-e0ba373147cb4f3ea352ee58293e3ce9f1e19b1d.tar.bz2 volse-hubzilla-e0ba373147cb4f3ea352ee58293e3ce9f1e19b1d.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl/jot-header.tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8daf2ddb7..c7bb7506e 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -127,6 +127,20 @@ function enableOnUser(){ } } ); + var uploader_sub = new window.AjaxUpload( + 'wall-image-upload-sub', + { action: '{{$baseurl}}/wall_upload/{{$nickname}}', + name: 'userfile', + title: upload_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); + } + } + ); + var file_uploader = new window.AjaxUpload( 'wall-file-upload', { action: '{{$baseurl}}/wall_attach/{{$nickname}}', @@ -137,7 +151,20 @@ function enableOnUser(){ addeditortext(response); $('#jot-media').val($('#jot-media').val() + response); $('#profile-rotator').spin(false); - } + } + } + ); + var file_uploader_sub = new window.AjaxUpload( + 'wall-file-upload-sub', + { action: '{{$baseurl}}/wall_attach/{{$nickname}}', + name: 'userfile', + title: attach_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); + } } ); @@ -312,11 +339,11 @@ function enableOnUser(){ function toggleVoting() { if($('#jot-consensus').val() > 0) { $('#jot-consensus').val(0); - $('#profile-voting').removeClass('icon-check').addClass('icon-check-empty'); + $('#profile-voting, #profile-voting-sub').removeClass('icon-check').addClass('icon-check-empty'); } else { $('#jot-consensus').val(1); - $('#profile-voting').removeClass('icon-check-empty').addClass('icon-check'); + $('#profile-voting, #profile-voting-sub').removeClass('icon-check-empty').addClass('icon-check'); } } |