aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/jot-header.tpl
diff options
context:
space:
mode:
authorThomas <rat@rlyeh-military-affairs>2012-03-09 01:50:51 +0000
committerThomas <rat@rlyeh-military-affairs>2012-03-09 01:50:51 +0000
commiteb84a22da749264fa79829d27471002d9f1e287f (patch)
tree3f06ec010f13484dd50eceb7ca7f58e96b4e8847 /view/theme/dispy/jot-header.tpl
parent6ae5962b009cfd88925eae721e24bf895e8b78d5 (diff)
parentb86a08166cf0db891392b2877c290231a3143238 (diff)
downloadvolse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.gz
volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.bz2
volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
-rw-r--r--view/theme/dispy/jot-header.tpl10
1 files changed, 4 insertions, 6 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index e72000b4c..43dcdbb84 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,12 +1,7 @@
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
<script type="text/javascript">
-
var editor = false;
var textlen = 0;
var plaintext = '$editselect';
-// this is here because of the silly tinymce error. didn't help.
-var skin = 'default';
function initEditor(cb) {
if (editor==false) {
@@ -119,7 +114,9 @@ function enableOnUser(){
$(this).val("");
initEditor();
}
-
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
var ispublic = '$ispublic';
var addtitle = '$addtitle';
@@ -127,6 +124,7 @@ function enableOnUser(){
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
+ /* enable character counter */
$("#profile-jot-text").focus(charCounter);
$("#profile-jot-text").click(charCounter);