Merge pull request TwistedInteractive#9 from justify/master

Text Box
r00dY · Dec 6, 2011 · 146fd8a · 146fd8a
2 parents dd13667 + 0cd8abc
commit 146fd8a
Show file tree

Hide file tree

Showing 65 changed files with 11 additions and 4 deletions.
diff --git a/LICENCE.txt b/LICENCE.txt
diff --git a/README.markdown b/README.markdown
diff --git a/assets/filebrowser.css b/assets/filebrowser.css
diff --git a/assets/filebrowser.js b/assets/filebrowser.js
diff --git a/assets/images/doc.png b/assets/images/doc.png
diff --git a/assets/images/font.png b/assets/images/font.png
diff --git a/assets/images/html.png b/assets/images/html.png
diff --git a/assets/images/image.png b/assets/images/image.png
diff --git a/assets/images/pdf.png b/assets/images/pdf.png
diff --git a/assets/images/presentation.png b/assets/images/presentation.png
diff --git a/assets/images/sound.png b/assets/images/sound.png
diff --git a/assets/images/spreadsheet.png b/assets/images/spreadsheet.png
diff --git a/assets/images/swf.png b/assets/images/swf.png
diff --git a/assets/images/txt.png b/assets/images/txt.png
diff --git a/assets/images/unknown.png b/assets/images/unknown.png
diff --git a/assets/images/video.png b/assets/images/video.png
diff --git a/assets/images/zip.png b/assets/images/zip.png
diff --git a/assets/jquery.ba-serializeobject.min.js b/assets/jquery.ba-serializeobject.min.js
diff --git a/assets/jquery.form.js b/assets/jquery.form.js
diff --git a/assets/symphony.ckeditor.css b/assets/symphony.ckeditor.css
diff --git a/assets/symphony.ckeditor.js b/assets/symphony.ckeditor.js
@@ -3,6 +3,7 @@ if (typeof Symphony.ADMIN == "undefined") {
 }
 
 jQuery(document).ready(function () {
+
 	// See if there are any ckeditor textareas:
     jQuery('textarea.ckeditor, textarea.ckeditor_compact').each(function(index) {
         // Set the configurationdata:
@@ -65,7 +66,10 @@ jQuery(document).ready(function () {
             jQuery("label.ck_compact td.cke_contents").css({borderBottom: "1px solid #aaa"});
 		});
 
+		//Stop CKEditor creating another instance
+		jQuery(this).removeClass('ckeditor ckeditor_compact');
+
 		// Replace CKEditor instances:
         CKEDITOR.replace(objectName, configurationData);
     });
-});
+});
diff --git a/content/content.filebrowser.php b/content/content.filebrowser.php
diff --git a/content/content.filebrowserajax.php b/content/content.filebrowserajax.php
diff --git a/content/content.pages.php b/content/content.pages.php
diff --git a/extension.driver.php b/extension.driver.php
@@ -103,8 +103,11 @@ public function uninstall()
 		 */		 
  		protected $addedCKEditorHeaders = false;
 
-		public function applyCKEditor($context) {		
-			if($context['field']->get('formatter') != 'ckeditor' && $context['field']->get('formatter') != 'ckeditor_compact') return;
+		public function applyCKEditor($context) {	
+
+			$format = $context['field']->get('text_formatter') == TRUE ? 'text_formatter' : 'formatter';
+
+			if(($context['field']->get($format) != 'ckeditor' && $context['field']->get($format) != 'ckeditor_compact')) return;
 
 			if(!$this->addedCKEditorHeaders){
 				Administration::instance()->Page->addScriptToHead(URL . '/extensions/ckeditor/lib/ckeditor/ckeditor.js', 200, false);
@@ -117,4 +120,4 @@ public function applyCKEditor($context) {
 
 	}
 
-?>
+?>
diff --git a/lib/ckeditor/.htaccess b/lib/ckeditor/.htaccess
diff --git a/lib/ckeditor/adapters/jquery.js b/lib/ckeditor/adapters/jquery.js
diff --git a/lib/ckeditor/ckeditor.js b/lib/ckeditor/ckeditor.js
diff --git a/lib/ckeditor/config.js b/lib/ckeditor/config.js
diff --git a/lib/ckeditor/contents.css b/lib/ckeditor/contents.css
diff --git a/lib/ckeditor/images/spacer.gif b/lib/ckeditor/images/spacer.gif
diff --git a/lib/ckeditor/lang/en.js b/lib/ckeditor/lang/en.js
diff --git a/lib/ckeditor/plugins/image/dialogs/image.js b/lib/ckeditor/plugins/image/dialogs/image.js
diff --git a/lib/ckeditor/plugins/link/dialogs/anchor.js b/lib/ckeditor/plugins/link/dialogs/anchor.js
diff --git a/lib/ckeditor/plugins/link/dialogs/link.js b/lib/ckeditor/plugins/link/dialogs/link.js
diff --git a/lib/ckeditor/plugins/link/images/anchor.gif b/lib/ckeditor/plugins/link/images/anchor.gif
diff --git a/lib/ckeditor/plugins/link/plugin.js b/lib/ckeditor/plugins/link/plugin.js
diff --git a/lib/ckeditor/plugins/liststyle/dialogs/liststyle.js b/lib/ckeditor/plugins/liststyle/dialogs/liststyle.js
diff --git a/lib/ckeditor/plugins/showblocks/images/block_address.png b/lib/ckeditor/plugins/showblocks/images/block_address.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_blockquote.png b/lib/ckeditor/plugins/showblocks/images/block_blockquote.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_div.png b/lib/ckeditor/plugins/showblocks/images/block_div.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h1.png b/lib/ckeditor/plugins/showblocks/images/block_h1.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h2.png b/lib/ckeditor/plugins/showblocks/images/block_h2.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h3.png b/lib/ckeditor/plugins/showblocks/images/block_h3.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h4.png b/lib/ckeditor/plugins/showblocks/images/block_h4.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h5.png b/lib/ckeditor/plugins/showblocks/images/block_h5.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_h6.png b/lib/ckeditor/plugins/showblocks/images/block_h6.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_p.png b/lib/ckeditor/plugins/showblocks/images/block_p.png
diff --git a/lib/ckeditor/plugins/showblocks/images/block_pre.png b/lib/ckeditor/plugins/showblocks/images/block_pre.png
diff --git a/lib/ckeditor/plugins/styles/styles/default.js b/lib/ckeditor/plugins/styles/styles/default.js
diff --git a/lib/ckeditor/skins/chris/dialog.css b/lib/ckeditor/skins/chris/dialog.css
diff --git a/lib/ckeditor/skins/chris/editor.css b/lib/ckeditor/skins/chris/editor.css
diff --git a/lib/ckeditor/skins/chris/icons.png b/lib/ckeditor/skins/chris/icons.png
diff --git a/lib/ckeditor/skins/chris/images/dialog_sides.gif b/lib/ckeditor/skins/chris/images/dialog_sides.gif
diff --git a/lib/ckeditor/skins/chris/images/dialog_sides.png b/lib/ckeditor/skins/chris/images/dialog_sides.png
diff --git a/lib/ckeditor/skins/chris/images/gradient.png b/lib/ckeditor/skins/chris/images/gradient.png
diff --git a/lib/ckeditor/skins/chris/images/mini.gif b/lib/ckeditor/skins/chris/images/mini.gif
diff --git a/lib/ckeditor/skins/chris/images/noimage.png b/lib/ckeditor/skins/chris/images/noimage.png
diff --git a/lib/ckeditor/skins/chris/images/sprites.png b/lib/ckeditor/skins/chris/images/sprites.png
diff --git a/lib/ckeditor/skins/chris/images/sprites_ie6.png b/lib/ckeditor/skins/chris/images/sprites_ie6.png
diff --git a/lib/ckeditor/skins/chris/skin.js b/lib/ckeditor/skins/chris/skin.js
diff --git a/lib/ckeditor/skins/chris/templates.css b/lib/ckeditor/skins/chris/templates.css
diff --git a/lib/ckeditor/themes/default/theme.js b/lib/ckeditor/themes/default/theme.js
diff --git a/text-formatters/formatter.ckeditor.php b/text-formatters/formatter.ckeditor.php
diff --git a/text-formatters/formatter.ckeditor_compact.php b/text-formatters/formatter.ckeditor_compact.php