diff options
author | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
---|---|---|
committer | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
commit | 3d249f0eddb058f74b33d8205202b17ab7555aa6 (patch) | |
tree | 112e38aa464e5830832ff92a93e10f2566cbe27e /view/jot-header.tpl | |
parent | 36a1a43f06dc2a0d55463c83154cce55fa3948ad (diff) | |
parent | 733f830be4b554c83361e877a5f1108767a815fc (diff) | |
download | volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.gz volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.bz2 volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/jot-header.tpl')
-rwxr-xr-x | view/jot-header.tpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 007f639b6..d6b172b6a 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -15,7 +15,7 @@ function initEditor(cb){ $("a#jot-perms-icon").fancybox({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' - }); + }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); return; @@ -129,7 +129,6 @@ function enableOnUser(){ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); - var uploader = new window.AjaxUpload( 'wall-image-upload', { action: 'wall_upload/$nickname', |