morrigan_editor_rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ea57dd9231d4d31922c232b7c00afce8b19bfc
-  data.tar.gz: c558fe32d83524ba4fed855cf0404c1c8920e436
+  metadata.gz: 1649ccf80e56d1ceec2cba8e3d4e945b1c066f10
+  data.tar.gz: a0478ce43978ca46e2c8f05bb6f7436fc18e9630
 SHA512:
-  metadata.gz: cab2b3ee9d97d78ec293cb47869c1e637c859f81da5e756c5c2932e332dfab0dd768af2f794ec5e1efbffb95ec957e73069ca4a513250539c8cb338599cfb70f
-  data.tar.gz: 4858a5c67b3d3f9b1e53fcf730369d4a1cfdfa59c0616c5640e147bd775bf326d780409752ec53d5e4850ecb363646514f1df82d152e668f1024f2881aa5c252
+  metadata.gz: 58020a90006629e0127a1624ac66c7648b1f697a7b4ea6fabe7941ddd6f9c74df8f5a1d306b98f504290b282de5317ba7eb30d6a75b9c3565dea41122448dab5
+  data.tar.gz: 09b6e8b889f96d08c61f172b93e3b34e376b50eb0f5b6b4e24e66af486ce131c99e710b532e3719e6ff667ffe64e6ab3439d75f1aea1285d2ea84daa57d1ee1a

data/app/assets/javascripts/morrigan_editor_rails/main.js.erb

@@ -19,6 +19,15 @@ $(function () {
                 textarea.val(editor.morrigan_editor('html'));
                 return true;
             });
+
+            if (textarea.parent().hasClass('has-error')) {
+                container.addClass('has-error');
+            }
+
+            if ($.trim(textarea.val()) != '') {
+                editor.morrigan_editor('html', textarea.val());
+            }
+
         }
     });
 });

data/lib/morrigan_editor_rails/version.rb

@@ -1,3 +1,3 @@
 module MorriganEditorRails
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/dummy/app/views/test/index.html.erb

@@ -1,7 +1,7 @@
 <!--<%= asset_path('morrigan_editor_rails/iframe.css') %>-->
 <!--<%= MorriganEditorRails::Editor.sanitize '<b><a href="http://foo.com/">foo</a></b><img src="bar.jpg">' %>    -->
 <form id="form">
-    <textarea id="textarea"></textarea>
+    <div class="has-error"><textarea id="textarea"><p>ads</p><p>fgh</p></textarea></div>
     <div morrigan-editor="true" id="editor" editor-width="100%" editor-height="300px" editor-bound-textarea="#textarea"></div>
     <input type="submit">
 </form>

data/test/dummy/log/development.log

@@ -10113,3 +10113,196 @@ Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-24 18:28:19 +04
 
 
 Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-24 18:28:19 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-07-26 15:25:22 +0400
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (6.8ms)
+Completed 200 OK in 221ms (Views: 220.6ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-26 15:25:23 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (1.3ms)
+Completed 200 OK in 8ms (Views: 8.3ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-26 15:25:55 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (3.2ms)
+Completed 200 OK in 9ms (Views: 8.6ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-26 15:27:15 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 55ms (Views: 54.5ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-26 15:28:50 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-26 15:28:50 +0400

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

@@ -1 +1 @@
-19537
+20187

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morrigan_editor_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sergey Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails