harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bring back PM upload functionality and why oh why are we still loading tinymce?

Browse Source
This commit is contained in:
friendica 2014-10-13 03:07:36 -07:00
parent 6e238ce5af
commit 7abaccaf7f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
version.inc
View File

@ -1 +1 @@
2014-10-12.826 2014-10-13.827

2
view/php/theme_init.php
View File

@ -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/jquery_ac/friendica.complete.js');
head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js');
head_add_js('library/jgrowl/jquery.jgrowl_minimized.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/components/core-min.js');
head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/aes.js');
head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/rabbit.js');

4
view/tpl/msg-header.tpl
View File

@ -49,7 +49,7 @@ else
<script> <script>
$(document).ready(function() { $(document).ready(function() {
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
'prvmail-upload', 'prvmail-upload-wrapper',
{ action: 'wall_upload/{{$nickname}}', { action: 'wall_upload/{{$nickname}}',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
@ -61,7 +61,7 @@ else
); );
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'prvmail-attach', 'prvmail-attach-wrapper',
{ action: 'wall_attach/{{$nickname}}', { action: 'wall_attach/{{$nickname}}',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },