Upgrading tiny mce

teknopaul · Jul 12, 2014 · a0bde19 · a0bde19
1 parent 50f8818
commit a0bde19
Show file tree

Hide file tree

Showing 340 changed files with 1,264 additions and 49,849 deletions.
diff --git a/client/app/edit.html b/client/app/edit.html
@@ -6,24 +6,32 @@
 
 <!--#include virtual="/app/inc.html" -->
 
-<script type="text/javascript" src="js/jquery.tinymce.js"></script>
+<script type="text/javascript" src="js/jquery.tinymce.min.js"></script>
 <script type="text/javascript">
 $(function() {
 	$('textarea.tinymce').tinymce({
     	// Location of TinyMCE script
-		script_url : 'js/tiny_mce.js',
-
-      // General options
-      theme : "advanced",
-      theme_advanced_toolbar_location : "top",
-      theme_advanced_toolbar_align : "left",
-      theme_advanced_statusbar_location : "bottom",
-      theme_advanced_resizing : true,
-      theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,blockquote,dt,dd,samp",
-      skin : "thebigreason",
-   	// Usable CSS for the HTML
-      content_css : "/app/skin/public.css",
-	  mode : "textareas"
+		script_url : 'js/tinymce.min.js',
+
+		// General options
+		theme : "modern",
+		auto_focus : "mce-content",
+		browser_spellcheck : true,
+		plugins : 'advlist autolink link image lists charmap print preview fullscreen',
+		toolbar : "undo redo | styleselect formatselect | table hr bullist numlist outdent indent | link image | fullscreen",
+		menubar : false,
+		resize: "both",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "left",
+		statusbar : true,
+		object_resizing : true,
+		theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,blockquote,dt,dd,samp",
+		skin : "lightgray",
+		// Usable CSS for the HTML
+		content_css : "/app/skin/public.css",
+		mode : "textareas",
+		height: 400
+
 	});
 });
 
@@ -42,7 +50,7 @@
 <h1 id="pw-title">&nbsp;</h1>
 
 <form id="pw-editor-form">
-<textarea class="pw-html-editor tinymce" name="content"></textarea><br/>
+<textarea class="pw-html-editor tinymce" name="content" id="mce-content"></textarea><br/>
 <input type="submit" value="Save" id="pw-save"></input>
 <input type="submit" value="Save + View" id="pw-save-and-view"></input>
 </form>

diff --git a/client/app/inc.html b/client/app/inc.html
@@ -1,7 +1,7 @@
 <link rel="SHORTCUT_ICON" href="/app/facicon.png" />
 <link href="/app/style.css" rel="stylesheet" type="text/css" />
 <link href="/app/skin/public.css" rel="stylesheet" type="text/css" />
-<script src="/app/js/jquery-1.4.2.js"></script>
+<script src="/app/js/jquery-2.1.1.min.js"></script>
 <script src="/app/js/jquery.closure.js"></script>
 <script src="/app/js/jquery.htmlbuffer.js"></script>
 <script src="/app/js/popups.js"></script>