From 7abaccaf7fc539216ff3a3395a3e280c4517a054 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 13 Oct 2014 03:07:36 -0700
Subject: bring back PM upload functionality and why oh why are we still
 loading tinymce?

---
 view/php/theme_init.php | 2 +-
 view/tpl/msg-header.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'view')

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'); },
-- 
cgit v1.2.3


From a512d1a4aab35ac874ccbff89d84fdd6d5b3343f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 13 Oct 2014 03:15:03 -0700
Subject: tinymce still seems to be referenced. Can't quite get rid of it.

---
 view/php/theme_init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index baa83f25f..f1eaded6a 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');
-- 
cgit v1.2.3