aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/msg-header.tpl
diff options
context:
space:
mode:
authorPaolo T <tuscanhobbit@users.noreply.github.com>2014-11-24 14:19:22 +0100
committerPaolo T <tuscanhobbit@users.noreply.github.com>2014-11-24 14:19:22 +0100
commitbef8879cb1356b880279c6104fcffb0752414a7c (patch)
treece3733df7ca168f4afe7e963dc81b6f00944c34c /view/tpl/msg-header.tpl
parent1cb45c30e9032794b7827738cc28f7728ac28677 (diff)
parent5b7124f0daeca4aa619f6411ee373d9ff5a22b7b (diff)
downloadvolse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.gz
volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.bz2
volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.zip
Merge pull request #7 from friendica/master
Merge from main project
Diffstat (limited to 'view/tpl/msg-header.tpl')
-rwxr-xr-xview/tpl/msg-header.tpl28
1 files changed, 14 insertions, 14 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 503e4c8cc..85fa51b0a 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -52,10 +52,10 @@ else
'prvmail-upload-wrapper',
{ action: 'wall_upload/{{$nickname}}',
name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+ onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
onComplete: function(file,response) {
- addeditortext(response);
- $('#profile-rotator').spin(false);
+ addmailtext(response);
+ $('#prvmail-rotator').spin(false);
}
}
);
@@ -64,23 +64,23 @@ else
'prvmail-attach-wrapper',
{ action: 'wall_attach/{{$nickname}}',
name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+ onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
onComplete: function(file,response) {
- addeditortext(response);
- $('#profile-rotator').spin(false);
+ addmailtext(response);
+ $('#prvmail-rotator').spin(false);
}
}
);
});
- function jotGetLink() {
+ function prvmailJotGetLink() {
reply = prompt("{{$linkurl}}");
if(reply && reply.length) {
- $('#profile-rotator').spin('tiny');
+ $('#prvmail-rotator').spin('tiny');
$.get('parse_url?url=' + reply, function(data) {
- addeditortext(response);
- $('#profile-rotator').spin(false);
+ addmailtext(data);
+ $('#prvmail-rotator').spin(false);
});
}
}
@@ -103,15 +103,15 @@ else
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
- $('#profile-rotator').spin('tiny');
+ $('#prvmail-rotator').spin('tiny');
$.get('parse_url?url=' + reply, function(data) {
- addeditortext(response);
- $('#profile-rotator').spin(false);
+ addmailtext(data);
+ $('#prvmail-rotator').spin(false);
});
}
}
- function addeditortext(data) {
+ function addmailtext(data) {
if(plaintext == 'none') {
var currentText = $("#prvmail-text").val();
$("#prvmail-text").val(currentText + data);