diff options
| author | friendica <info@friendica.com> | 2013-07-14 01:23:07 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-07-14 01:23:07 -0700 |
| commit | 5b6294dbc0b444c5120b655bc4876270f2f8822d (patch) | |
| tree | 883b85d07345ac91f76da126136dc5a6ff1feb2c /view/tpl/jot-header.tpl | |
| parent | 25ed8788e909d176b73bcb04492c2e3edbdaf662 (diff) | |
| parent | 873c1f381e039f631a2634de1747ec85a6bad5d6 (diff) | |
| download | volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.tar.gz volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.tar.bz2 volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl/jot-header.tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ae0ccc8e8..dfc707fb5 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -12,9 +12,9 @@ var plaintext = '{{$editselect}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").show(); + $("#profile-jot-text-loading").spin('small'); if(plaintext == 'none') { - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; @@ -83,7 +83,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -200,12 +200,12 @@ function enableOnUser(){ function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).show(); + $('#like-rotator-' + id).spin('tiny); $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).hide(); + $('#like-rotator-' + id).spin(false); $(window).scrollTop(0); }); |