rich 1.3.1 → 1.4

data/README.rdoc

@@ -153,13 +153,15 @@ When you change styles after uploading files, you will need to re-process those
 
 === Using the file manager without CKEditor
 
-Besides from within the editor, the file manager can also be used on it's own. See the <tt>rich_picker</tt> examples above. One important thing to note is that this requires a string field on the receiving object. If you provide an input field that's #ID ends in <tt>_id</tt>, the picker will return the ID of the <tt>Rich::RichFile</tt> object (for use in a relation perhaps?). If the #ID of the input ends in anything else, it will return the URL of the asset you selected.
+Besides from within the editor, the file manager can also be used on it's own. See the <tt>rich_picker</tt> examples above.
 
-Pass the config option <tt>:hidden_input => true</tt> to use a hidden text field.
+When the field you connect the picker to defines a relation (i.e. it ends in <tt>_id</tt>), the picker will return a reference to Rich::RichFile object. If the field you connect the picker does not refine a relation but is instead a string, the picker will return a URL to the file chosen in the picker.
 
-Pass the config option <tt>:preview_size => '100px'</tt> to specify the size of the image you want to preview, otherwise the full size version of the image you pick will be shown.
+In the picker's configuration (or globally in your initializer), you can optionally pass the following:
 
-Pass the config option <tt>:placeholder_image => image_path('placeholder.png')</tt> to show a placeholder image that will be replaced when an asset has been selected.
+    :hidden_input => true # hide the textfield that is populated with the file ID or URL. Handy when creating relations (since the ID doesn't tell you much).
+    :preview_size => '100px' # specify the bounding box of the image preview
+    :placeholder_image => image_path('placeholder.png') # show a placeholder image that will be replaced when an asset has been selected
 
 You might use this in a relation like this in ActiveAdmin:
 
@@ -168,7 +170,7 @@ You might use this in a relation like this in ActiveAdmin:
       f.input :title
     end
     f.has_many :assets do |asset_form|
-      asset_form.input :rich_file_id, :as => :rich_picker, :config => {:style => 'width: 400px !important;', :hidden_input => true, :placeholder_image => image_path('placeholder.png'), :preview_size => :thumb}
+      asset_form.input :rich_file_id, :as => :rich_picker, :config => {:style => 'width: 400px !important;', :hidden_input => true, :placeholder_image => image_path('placeholder.png'), :preview_size => '200px'}
     end
     f.buttons
   end
@@ -264,6 +266,7 @@ Your contributions (small and large) are very welcome! Please fork the project,
 
 == Copyright
 
-Rich was created by Bastiaan Terhorst and is sponsored by Perceptor (http://perceptor.nl).
+Rich, the affluent editor. By Bastiaan Terhorst and the Contributors[https://github.com/bastiaanterhorst/rich/graphs/contributors].
+Sponsored by Perceptor[http://perceptor.nl].
 
 This project is licenced under the MIT License. See MIT-LICENSE for details.

data/app/assets/javascripts/rich/base.js.erb

@@ -1,6 +1,5 @@
 // Wire up Rich
 //= require rich/editor/ckeditor_path
 //= require ckeditor/ckeditor
-//= require ckeditor/adapters/jquery
 //= require rich/editor/rich_editor
 //= require rich/editor/rich_picker

data/app/assets/javascripts/rich/editor/rich_editor.js.erb

@@ -10,7 +10,5 @@ function addQueryString( url, params ) {
 }
 
 // load external plugins
-CKEDITOR.plugins.addExternal('audio', '<%= asset_path('ckeditor-contrib/plugins/audio/') %>');
 CKEDITOR.plugins.addExternal('MediaEmbed', '<%= asset_path('ckeditor-contrib/plugins/MediaEmbed/') %>');
-CKEDITOR.plugins.addExternal('richfile', '<%= asset_path('ckeditor-contrib/plugins/richfile/') %>');
-CKEDITOR.config.skin = 'BootstrapCK-Skin,<%= asset_path('ckeditor-contrib/skins/BootstrapCK/') %>';
+CKEDITOR.plugins.addExternal('richfile', '<%= asset_path('ckeditor-contrib/plugins/richfile/') %>');

data/lib/rich.rb

@@ -64,8 +64,8 @@ module Rich
   @@editor = {
     :height => 400,
     :stylesSet  =>  [],
-    :extraPlugins => 'stylesheetparser,richfile,MediaEmbed,audio',
-    :removePlugins => 'scayt,menubutton,contextmenu,image,forms',
+    :extraPlugins => 'stylesheetparser,richfile,MediaEmbed',
+    :removePlugins => 'scayt,menubutton,image,forms',
     :contentsCss => :default,
     :removeDialogTabs => 'link:advanced;link:target',
     :startupOutlineBlocks => true,

data/lib/rich/version.rb

@@ -1,3 +1,3 @@
 module Rich
-  VERSION = "1.3.1"
+  VERSION = "1.4"
 end

data/vendor/assets/ckeditor/ckeditor-contrib/plugins/mediaembed/plugin.js

@@ -0,0 +1,64 @@
+/*
+* Embed Media Dialog based on http://www.fluidbyte.net/embed-youtube-vimeo-etc-into-ckeditor
+*
+* Plugin name:      mediaembed
+* Menu button name: MediaEmbed
+*
+* Youtube Editor Icon
+* http://paulrobertlloyd.com/
+*
+* @author Fabian Vogelsteller [frozeman.de]
+* @version 0.1
+*/
+( function() {
+    CKEDITOR.plugins.add( 'mediaembed',
+    {
+        init: function( editor )
+        {
+           var me = this;
+           CKEDITOR.dialog.add( 'MediaEmbedDialog', function ()
+           {
+              return {
+                 title : 'Embed Media',
+                 minWidth : 550,
+                 minHeight : 200,
+                 contents :
+                       [
+                          {
+                             id : 'iframe',
+                             expand : true,
+                             elements :[{
+                                id : 'embedArea',
+                                type : 'textarea',
+                                label : 'Paste Embed Code Here',
+                                'autofocus':'autofocus',
+                                setup: function(element){
+                                },
+                                commit: function(element){
+                                }
+                              }]
+                          }
+                       ],
+                  onOk : function() {
+                    for (var i=0; i<window.frames.length; i++) {
+                       if(window.frames[i].name == 'iframeMediaEmbed') {
+                          var content = window.frames[i].document.getElementById("embed").value;
+                       }
+                    }
+                    console.log(this.getContentElement( 'iframe', 'embedArea' ).getValue());
+                    editor.insertHtml(this.getContentElement( 'iframe', 'embedArea' ).getValue());
+                 }
+              };
+           } );
+
+            editor.addCommand( 'MediaEmbed', new CKEDITOR.dialogCommand( 'MediaEmbedDialog' ) );
+
+            editor.ui.addButton( 'MediaEmbed',
+            {
+                label: 'Embed Media',
+                command: 'MediaEmbed',
+                icon: this.path + 'images/icon.png'
+            } );
+        }
+    } );
+} )();

data/vendor/assets/ckeditor/ckeditor/CHANGES.md

@@ -0,0 +1,56 @@
+CKEditor 4 Changelog
+====================
+
+## CKEditor 4.0.1
+
+Fixed issues:
+
+* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in new Moono skin.
+* Accessibility issues (mainly on inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
+* Magic-line:
+    * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic-line.
+    * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic-line support for forms.
+    * [#9573](http://dev.ckeditor.com/ticket/9573): Magic-line doesn't disappear on `mouseout` in the specific case.
+* [#9754](http://dev.ckeditor.com/ticket/9754): [Webkit] Cut & paste simple unformatted text generates inline wrapper in Webkits.
+* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS-Word.
+* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
+* Context menu:
+    * [#9712](http://dev.ckeditor.com/ticket/9712): Context menu open destroys editor focus.
+    * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over floating toolbar.
+    * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates JS error in inline mode when editor attached to header element.
+* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing window.
+* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div based editor puts editing area under bottom UI space.
+* [#9528](http://dev.ckeditor.com/ticket/9528): Host page's `box-sizing` style shouldn't influence editor UI elements.
+* [#9503](http://dev.ckeditor.com/ticket/9503): Forms plugin adds context menu listeners only on supported input types. Added support for `tel, email, search` and `url` input types.
+* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in narrow window.
+* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog doesn't populate width correctly.
+* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in nested table removes outer table cell.
+* [#9815](http://dev.ckeditor.com/ticket/9815): Can't edit dialog fields on editor initialized in jQuery UI modal dialog.
+* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialogs do not show completely in small window.
+* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a div stay permanently even after user exists editing the div.
+* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing format combo by clicking on its button.
+* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when `border-width` style is specified.
+* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read only mode.
+* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected image.
+* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>`.
+* [#9709](http://dev.ckeditor.com/ticket/9709): PasteFromWord should not depend on configuration from other styles.
+* [#9726](http://dev.ckeditor.com/ticket/9726): Removed color dialog dependency from table tools.
+* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly on Accessibility Instructions dialog.
+* [#9771](http://dev.ckeditor.com/ticket/9771): [Webkit & Opera] Fixed scrolling issues when pasting.
+* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] onChange isn't fired for checkboxes in dialogs.
+* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When we open toolbar menu for the first time & press down arrow key, focus goes to next toolbar button instead of menu options.
+* [#9847](http://dev.ckeditor.com/ticket/9847): Elements path shouldn't be initialized on inline editor.
+* [#9853](http://dev.ckeditor.com/ticket/9853): `Editor#addRemoveFormatFilter` is exposed before it really works.
+* [#8893](http://dev.ckeditor.com/ticket/8893): Value of `pasteFromWordCleanupFile` config is now taken from instance configuration.
+* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "live preview" checkbox from UI color picker.
+
+
+## CKEditor 4.0
+
+The first stable release of the new CKEditor 4 code line.
+
+The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
+possible. The list of relevant changes can be found in the [API Changes page of
+the CKEditor 4 documentation][1].
+
+[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes""

data/vendor/assets/ckeditor/ckeditor/{LICENSE.html → LICENSE.md}

@@ -1,13 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-== BEGIN TEXT ONLY VERSION ==
-
 Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -28,10 +23,12 @@ You are not required to, but if you want to explicitly declare the
 license you have chosen to be bound to when using, reproducing,
 modifying and distributing this software, just include a text file
 titled "legal.txt" in your version of this software, indicating your
-license choice.
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
 
 Sources of Intellectual Property Included in CKEditor
-=====================================================
+-----------------------------------------------------
 
 Where not otherwise indicated, all CKEditor content is authored by
 CKSource engineers and consists of CKSource-owned intellectual
@@ -39,24 +36,26 @@ property. In some specific instances, CKEditor will incorporate work
 done by developers outside of CKSource with their express permission.
 
 Trademarks
-==========
+----------
 
 CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
 and product names are trademarks, registered trademarks or service
 marks of their respective holders.
 
+---
+
 Appendix A: The GPL License
-===========================
+---------------------------
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -106,8 +105,8 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
@@ -305,7 +304,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -327,14 +326,14 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS
 
 
 Appendix B: The LGPL License
-============================
+----------------------------
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -345,7 +344,7 @@ Appendix B: The LGPL License
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -447,8 +446,8 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+GNU LESSER GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
 program which contains a notice placed by the copyright holder or
@@ -767,7 +766,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -790,16 +789,14 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS
 
 
 Appendix C: The MPL License
-===========================
+---------------------------
 
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ===============
+MOZILLA PUBLIC LICENSE
+Version 1.1
 
 1. Definitions.
 
@@ -1265,63 +1262,3 @@ EXHIBIT A -Mozilla Public License.
      the notices in the Source Code files of the Original Code. You should
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]
-
-== END TEXT ONLY VERSION ==
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>License - CKEditor</title>
-</head>
-<body>
-	<h1>
-		Software License Agreement
-	</h1>
-	<p>
-		<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
-			http://ckeditor.com</a><br />
-		Copyright &copy; 2003-2012, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
-	</p>
-	<p>
-		Licensed under the terms of any of the following licenses at your choice:
-	</p>
-	<ul>
-		<li><a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> Version
-			2 or later (the "GPL");</li>
-		<li><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
-			Version 2.1 or later (the "LGPL");</li>
-		<li><a href="http://www.mozilla.org/MPL/MPL-1.1.html">Mozilla Public License</a> Version
-			1.1 or later (the "MPL").</li>
-	</ul>
-	<p>
-		You are not required to, but if you want to explicitly declare the license you have
-		chosen to be bound to when using, reproducing, modifying and distributing this software,
-		just include a text file titled "LEGAL" in your version of this software, indicating
-		your license choice. In any case, your choice will not restrict any recipient of
-		your version of this software to use, reproduce, modify and distribute this software
-		under any of the above licenses.
-	</p>
-	<h2>
-		Sources of Intellectual Property Included in CKEditor
-	</h2>
-	<p>
-		Where not otherwise indicated, all CKEditor content is authored by CKSource engineers
-		and consists of CKSource-owned intellectual property. In some specific instances,
-		CKEditor will incorporate work done by developers outside of CKSource with their
-		express permission.
-	</p>
-	<p>
-		<a href="http://developer.yahoo.com/yui/yuitest/">YUI Test</a>: At _source/tests/yuitest.js
-		can be found part of the source code of YUI, which is licensed under the terms of
-		the <a href="http://developer.yahoo.com/yui/license.txt">BSD License</a>. YUI is
-		Copyright &copy; 2008, Yahoo! Inc.
-	</p>
-	<h2>
-		Trademarks
-	</h2>
-	<p>
-		CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product
-		names are trademarks, registered trademarks or service marks of their respective
-		holders.
-	</p>
-</body>
-</html>

data/vendor/assets/ckeditor/ckeditor/README.md

@@ -0,0 +1,39 @@
+CKEditor 4
+==========
+
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.  
+http://ckeditor.com - See LICENSE.md for license information.
+
+CKEditor is a text editor to be used inside web pages. It's not a replacement
+for desktop text editors like Word or OpenOffice, but a component to be used as
+part of web applications and websites.
+
+## Documentation
+
+The full editor documentation is available online at the following address:
+http://docs.ckeditor.com
+
+## Installation
+
+Installing CKEditor is an easy task. Just follow these simple steps:
+
+ 1. **Download** the latest version from the CKEditor website:
+    http://ckeditor.com. You should have already completed this step, but be
+    sure you have the very latest version.
+ 2. **Extract** (decompress) the downloaded file into the root of your website.
+
+**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
+place the files in whichever you want though.
+
+## Checking Your Installation
+
+The editor comes with a few sample pages that can be used to verify that
+installation proceeded properly. Take a look at the `samples` directory.
+
+To test your installation, just call the following page at your website:
+
+	http://<your site>/<CKEditor installation path>/samples/index.html
+
+For example:
+
+	http://www.example.com/ckeditor/samples/index.html