diff options
| author | friendica <info@friendica.com> | 2014-10-13 03:07:36 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-13 03:07:36 -0700 |
| commit | 7abaccaf7fc539216ff3a3395a3e280c4517a054 (patch) | |
| tree | 984b3fa24c218ddae1438320c95df93263e6f0b4 | |
| parent | 6e238ce5afaa5f66b1d920ce2e80182a227dbc9d (diff) | |
| download | volse-hubzilla-7abaccaf7fc539216ff3a3395a3e280c4517a054.tar.gz volse-hubzilla-7abaccaf7fc539216ff3a3395a3e280c4517a054.tar.bz2 volse-hubzilla-7abaccaf7fc539216ff3a3395a3e280c4517a054.zip | |
bring back PM upload functionality and why oh why are we still loading tinymce?
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 2 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/version.inc b/version.inc index 5c34749ec..f25d8bb18 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-12.826 +2014-10-13.827 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f1eaded6a..baa83f25f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -28,7 +28,7 @@ head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); -head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); +//head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index b6cff7c74..503e4c8cc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -49,7 +49,7 @@ else <script> $(document).ready(function() { var uploader = new window.AjaxUpload( - 'prvmail-upload', + 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, @@ -61,7 +61,7 @@ else ); var file_uploader = new window.AjaxUpload( - 'prvmail-attach', + 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, |