aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-19 20:11:09 -0700
committerFriendika <info@friendika.com>2011-05-19 20:11:09 -0700
commit20807ab8b4e0d1180b7fe74624a58b80b6cfc52a (patch)
tree618b1ebb22ba1372f929442fcae3fb979d08d198
parenta27b7fb28d151c00eef8319cdf876896d36df8b0 (diff)
downloadvolse-hubzilla-20807ab8b4e0d1180b7fe74624a58b80b6cfc52a.tar.gz
volse-hubzilla-20807ab8b4e0d1180b7fe74624a58b80b6cfc52a.tar.bz2
volse-hubzilla-20807ab8b4e0d1180b7fe74624a58b80b6cfc52a.zip
dispy jot-header.tpl missing some code updates
-rw-r--r--view/jot-header.tpl3
-rw-r--r--view/theme/dispy/jot-header.tpl18
2 files changed, 15 insertions, 6 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 0fcd1e42f..25f2736c7 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -30,13 +30,14 @@ tinyMCE.init({
//Character count
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
- textlen = txt.length;
+ var textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
+
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 40584878a..00a4371c4 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -31,23 +31,30 @@ tinyMCE.init({
//Character count
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
- var text = txt.length;
- if(txt.length <= 140) {
+ var textlen = txt.length;
+ if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+ $('#profile-jot-desc').html(ispublic);
+ }
+ else {
+ $('#profile-jot-desc').html('&nbsp;');
+ }
+
+ if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
- if((txt.length > 140) && (txt .length <= 420)) {
+ if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
- if(txt.length > 420) {
+ if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
- $('#character-counter').text(text);
+ $('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
@@ -60,6 +67,7 @@ tinyMCE.init({
</script>
<script type="text/javascript" src="include/ajaxupload.js" ></script>
<script>
+ var ispublic = '$ispublic';
$(document).ready(function() {
var uploader = new window.AjaxUpload(
'wall-image-upload',