aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-07 17:34:53 -0700
committerfriendica <info@friendica.com>2014-04-07 17:34:53 -0700
commit28228f58629828c9bcabd5cf6b99180f9fdc9d4a (patch)
treede4d4ef0b63794108f12393dba24b912e9ab0899
parent03753f463e05c965a460e64efca9478efc0271c1 (diff)
downloadvolse-hubzilla-28228f58629828c9bcabd5cf6b99180f9fdc9d4a.tar.gz
volse-hubzilla-28228f58629828c9bcabd5cf6b99180f9fdc9d4a.tar.bz2
volse-hubzilla-28228f58629828c9bcabd5cf6b99180f9fdc9d4a.zip
pass the original element title through the element stack so that it we don't lose it in the ajaxuploader.
-rw-r--r--view/js/ajaxupload.js4
-rwxr-xr-xview/tpl/jot-header.tpl4
2 files changed, 8 insertions, 0 deletions
diff --git a/view/js/ajaxupload.js b/view/js/ajaxupload.js
index 5719f30e0..c7d587dd1 100644
--- a/view/js/ajaxupload.js
+++ b/view/js/ajaxupload.js
@@ -264,6 +264,9 @@
action: 'upload.php',
// File upload name
name: 'userfile',
+
+ title: 'Upload',
+
// Additional data to send
data: {},
// Submit file as soon as it's selected
@@ -380,6 +383,7 @@
var input = document.createElement("input");
input.setAttribute('type', 'file');
+ input.setAttribute('title',this._settings.title);
input.setAttribute('name', this._settings.name);
addStyles(input, {
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 6f5b84bbe..25a7912ad 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -112,11 +112,14 @@ function enableOnUser(){
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
+ var upload_title = $('#wall-image-upload').attr('title');
+ var attach_title = $('#wall-file-upload').attr('title');
var uploader = new window.AjaxUpload(
'wall-image-upload',
{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
name: 'userfile',
+ title: upload_title,
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);
@@ -129,6 +132,7 @@ function enableOnUser(){
'wall-file-upload',
{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
name: 'userfile',
+ title: attach_title,
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);