morrigan_editor_rails 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213aa860f47ef0f027b88399c86ced7e7abe7f79
-  data.tar.gz: ea4af3ee1d455306dc5561bc45a7ec5f070f8839
+  metadata.gz: 45b15d3ca9d70fbce311f65c661b4e99b33216d8
+  data.tar.gz: c2d8ddebccdb8183f61f27037b8a8dd6e866aa11
 SHA512:
-  metadata.gz: 58110fcf076585a0b158c13ad7e811f0bbeaf816e5e49092572a167c4e7bd1a06e2b7a02c39936dc935bc633a93efd0eaf861ec780ced8056a54c553e8135573
-  data.tar.gz: f11a04972efab0ccd8927b5dcef6a0e3d6940ca336a5ef69d79015df3d41bbdb7a00d988aea19fb0b810bba2454f13260ae47dc3a73a31fea2f3413fce3f6496
+  metadata.gz: 632c57ed9043d8ca283042eb1c0732f7011bc1e412349ea88c014e232b86a5883d5c21ffaf6cc9c7a20f7d0ec2a555df282050b3ff1f738105152fb96170f4f1
+  data.tar.gz: 222dea1317b95f43f5f0c301bf99d3f8d54bc24f87374740ad24ef75b3a92c6f08ec60279e14bbab28d3a7340a56a60d22e4cbe07128cd6854e0b465a07eb940

data/README.md

@@ -1,3 +1,71 @@
 # Morrigan Editor for Ruby on Rails
 
-During development.
+## Installation
+1. Add it to your `Gemfile`:
+
+  ```ruby
+  gem 'morrigan_editor_rails'
+  ```
+2. Add to `routes.rb`:
+
+  ```ruby
+  mount MorriganEditorRails::Engine => "/morrigan_editor_rails" 
+  ```
+3. Create table for editor's uploaded images:
+
+  ```bash
+  rake morrigan_editor_rails:install:migrations
+  rake db:migrate
+  ```
+4. Add to `application.js`:
+  
+  ```ruby
+  //= require 'morrigan_editor_rails/application' 
+  ```
+5. Add to 'application.css':
+
+  ```ruby
+  *= require 'morrigan_editor_rails/application.css'
+  ```
+  
+## Usage
+Add to your HTML:
+```html
+<div morrigan-editor="true" id="editor" editor-width="100%" editor-height="300px" editor-bound-textarea="#textarea"></div>
+```
+where `editor-bound-textarea` attribute is contains of selector of bound textarea (generated in editor html code will be passed in this textarea before form submit).
+
+## Custom stylesheet
+To add custom stylesheet to editor:
+
+1. Add initializer `morrigan_editor.rb` with next code:
+
+  ```ruby
+  module MorriganEditorRails
+    class Engine < Rails::Engine
+      config.iframe_css_file_name = 'your_file_name.css'
+    end
+  end
+  ```
+2. Add initializer `assets.rb` with next code (or add next code to this file if it is exists):
+
+  ```ruby
+  Rails.application.config.assets.precompile += %w( your_file_name.css )
+  ```
+  
+## Custom uploader
+You can use your uploader by put it in initializers with `MorriganEditorImageUploader` class name:
+
+```ruby
+class MorriganEditorImageUploader < CarrierWave::Uploader::Base
+  # your code here
+end
+```
+
+## Sanitization
+```ruby
+MorriganEditorRails::Editor.sanitize(html)
+```
+
+## License
+© 2014 Sergey Sokolov. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/app/assets/javascripts/morrigan_editor_rails/morrigan-jquery-editor.js

@@ -10,7 +10,7 @@ $.widget( "morrigan.morrigan_editor", {
         spellCheck: true,
         toolbox: [
             [
-                ['format'],
+                ['format', 'clearFormat'],
                 ['bold', 'italy', 'strike'],
                 ['img', 'video'],
                 ['alignLeft', 'alignCenter', 'alignRight'],
@@ -56,6 +56,40 @@ $.widget( "morrigan.morrigan_editor", {
     _options: {},
 
     _actions: {
+        clearFormat: {
+            name: 'clearFormat',
+            view: {
+                activeBackground: '#aaa',
+                inactiveBackground: '#eee',
+                title: 'Clear format',
+                classes: 'fa fa-times'
+            },
+            onClickHandler: function (editor, action) {
+                var normalizeBlocks = function (element) {
+                    if (element.nodeName == 'UL' || element.nodeName == 'OL') {
+                        removeInlineStyles(element);
+                    } else {
+                        var text = $(element).text();
+                        $(element).replaceWith('<p>' + text + '</p>');
+                    }
+                };
+                var removeInlineStyles = function (element) {
+                    $(element).removeAttr('style');
+                    $(element).children().each(function() {
+                        removeInlineStyles(this);
+                    });
+                };
+                var cSelection = editor._selectionManager.getCustomSelection();
+                var isCaret = editor._selectionManager.isCaret(cSelection);
+                var topElements = editor._selectionManager.getTopSelectedElements(cSelection, isCaret);
+                var topElementsWithoutBlocks = $(topElements).filter(function () {
+                    return !$(this).hasClass('mrge-content-block');
+                });
+                topElementsWithoutBlocks.each(function () {
+                    normalizeBlocks(this);
+                });
+            }
+        },
         video: {
             name: 'video',
             view: {
@@ -1447,5 +1481,4 @@ $.widget( "morrigan.morrigan_editor", {
             return contentClone.html();
         }
     }
-
 });

data/app/assets/stylesheets/morrigan_editor_rails/iframe.css

@@ -1,5 +1,5 @@
 body.mrge-iframe-body {
-    white-space: pre-line; /* CSS 3.0 */
+    /*white-space: pre-line; *//* CSS 3.0 */
     word-wrap: break-word; /* IE 5+ */
     padding: 10px;
 }

data/lib/morrigan_editor_rails/version.rb

@@ -1,3 +1,3 @@
 module MorriganEditorRails
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/test/dummy/log/development.log

@@ -12279,3 +12279,51 @@ Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 13:33:50 +04
 
 
 Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (1.8ms)
+Completed 200 OK in 6ms (Views: 6.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-12-21 14:22:26 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-12-21 14:22:27 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-12-21 14:22:27 +0400

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morrigan_editor_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Sergey Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,7 +199,6 @@ files:
 - test/dummy/public/uploads/morrigan_editor_rails/editor_image/image/4/22129_b.jpeg
 - test/dummy/public/uploads/morrigan_editor_rails/editor_image/image/5/22129_b.jpeg
 - test/dummy/public/uploads/morrigan_editor_rails/editor_image/image/6/22129_b.jpeg
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/morrigan_editor_rails_test.rb
 - test/test_helper.rb
@@ -258,7 +257,6 @@ test_files:
 - test/dummy/public/uploads/morrigan_editor_rails/editor_image/image/4/22129_b.jpeg
 - test/dummy/public/500.html
 - test/dummy/Rakefile
-- test/dummy/tmp/pids/server.pid
 - test/dummy/bin/rails
 - test/dummy/bin/rake
 - test/dummy/bin/bundle

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-8964