aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/head.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-06 00:00:46 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-06 00:00:46 +0200
commit34d268544e565985014ada4369e8673c87883a0a (patch)
tree49a30ed61668405d731df2e32b4548516ecb58b5 /view/theme/dispy/head.tpl
parent81dfb61f930005f0f65b1f72935c10edc247a985 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.tar.gz
volse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.tar.bz2
volse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/head.tpl')
-rw-r--r--view/theme/dispy/head.tpl24
1 files changed, 21 insertions, 3 deletions
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
@@ -34,14 +34,16 @@
function commentOpen(obj,id) {
if(obj.value == '$comment') {
obj.value = '';
- obj.className = "comment-edit-text-full";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = '$comment';
- obj.className="comment-edit-text-empty";
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
closeMenu("comment-edit-submit-wrapper-" + id);
}
}
@@ -63,6 +65,22 @@
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
+ function qCommentInsert(obj,id) {
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == '$comment') {
+ tmpStr = '';
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ }
+ var ins = $(obj).val();
+ ins = ins.replace('&lt;','<');
+ ins = ins.replace('&gt;','>');
+ ins = ins.replace('&amp;','&');
+ ins = ins.replace('&quot;','"');
+ $("#comment-edit-text-" + id).val(tmpStr + ins);
+ }
+
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();