bootstrap-wysihtml5-rails 0.3.1.13 → 0.3.1.14

data/Rakefile

@@ -7,31 +7,31 @@ task 'update' do
   origin_src_path = "bootstrap-wysihtml5/src"
   dest_javascript_path = "vendor/assets/javascripts/bootstrap-wysihtml5"
   dest_css_path = "vendor/assets/stylesheets/bootstrap-wysihtml5"
-  
+
   system("rm -rf bootstrap-wysihtml5")
   system("git clone git://github.com/jhollingworth/bootstrap-wysihtml5.git")
-  
+
   system("cp #{origin_src_path}/bootstrap-wysihtml5.css #{dest_css_path}/core.css")
-  
+
   Dir.foreach("bootstrap-wysihtml5/src/locales") do |file|
     unless file == '.' || file == '..'
       abbreviated_file_name = file.gsub('bootstrap-wysihtml5.', '')
       system("cp #{origin_src_path}/locales/#{file} #{dest_javascript_path}/locales/#{abbreviated_file_name}")
     end
-  end    
+  end
 
   core_file = File.read("#{origin_src_path}/bootstrap-wysihtml5.js")
   original_string = /stylesheets: \[".\/lib\/css\/wysiwyg-color.css"\]/
-  objective_string = 'stylesheets: ["<%= Rails.configuration.assets.prefix + \'/bootstrap-wysihtml5/wysiwyg-color.css\' %>"]'      
-  
+  objective_string = 'stylesheets: ["<%= Rails.configuration.assets.prefix + \'/bootstrap-wysihtml5/wysiwyg-color.css\' %>"]'
+
   replaced   = core_file.gsub(original_string, objective_string)
 
   File.open("#{dest_javascript_path}/core.js.erb", "w") { |file| file.puts replaced }
-  
+
   system("cp #{origin_lib_path}/js/wysihtml5-0.3.0.js #{dest_javascript_path}/wysihtml5.js")
   system("cp #{origin_lib_path}/css/wysiwyg-color.css #{dest_css_path}/wysiwyg-color.css")
-  
-  
+
+
   system("git status")
 end
 
@@ -41,7 +41,7 @@ task "build" do
 end
 
 desc "Publish a new version"
-task "publish" do      
+task :publish => :build do
   system("gem push bootstrap-wysihtml5-rails-#{BootstrapWysihtml5Rails::Rails::VERSION}.gem")
   system("git push")
 end

data/lib/bootstrap-wysihtml5-rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapWysihtml5Rails
   module Rails
-    VERSION = "0.3.1.13"
+    VERSION = "0.3.1.14"
   end
 end

data/testapp/config/environments/development.rb

@@ -15,6 +15,8 @@ Testapp::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
+  
+  # config.action_controller.asset_host = 'testing'
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

data/vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb

@@ -226,11 +226,16 @@
             var urlInput = insertImageModal.find('.bootstrap-wysihtml5-insert-image-url');
             var insertButton = insertImageModal.find('a.btn-primary');
             var initialValue = urlInput.val();
+            var caretBookmark;
 
             var insertImage = function() {
                 var url = urlInput.val();
                 urlInput.val(initialValue);
                 self.editor.currentView.element.focus();
+                if (caretBookmark) {
+                  self.editor.composer.selection.setBookmark(caretBookmark);
+                  caretBookmark = null;
+                }
                 self.editor.composer.commands.exec("insertImage", url);
             };
 
@@ -255,6 +260,8 @@
                 var activeButton = $(this).hasClass("wysihtml5-command-active");
 
                 if (!activeButton) {
+                    self.editor.currentView.element.focus(false);
+                    caretBookmark = self.editor.composer.selection.getBookmark();
                     insertImageModal.modal('show');
                     insertImageModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
                         e.stopPropagation();
@@ -273,11 +280,16 @@
             var urlInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-url');
             var insertButton = insertLinkModal.find('a.btn-primary');
             var initialValue = urlInput.val();
+            var caretBookmark;
 
             var insertLink = function() {
                 var url = urlInput.val();
                 urlInput.val(initialValue);
                 self.editor.currentView.element.focus();
+                if (caretBookmark) {
+                  self.editor.composer.selection.setBookmark(caretBookmark);
+                  caretBookmark = null;
+                }
                 self.editor.composer.commands.exec("createLink", {
                     href: url,
                     target: "_blank",
@@ -307,6 +319,8 @@
                 var activeButton = $(this).hasClass("wysihtml5-command-active");
 
                 if (!activeButton) {
+                    self.editor.currentView.element.focus(false);
+                    caretBookmark = self.editor.composer.selection.getBookmark();
                     insertLinkModal.appendTo('body').modal('show');
                     insertLinkModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
                         e.stopPropagation();

data/vendor/assets/javascripts/bootstrap-wysihtml5/locales/bg-BG.js

@@ -0,0 +1,49 @@
+/**
+ * Bulgarian translation for bootstrap-wysihtml5
+ */
+(function($){
+    $.fn.wysihtml5.locale["bg-BG"] = {
+        font_styles: {
+            normal: "Нормален текст",
+            h1: "Заглавие 1",
+            h2: "Заглавие 2",
+            h3: "Заглавие 3"
+        },
+        emphasis: {
+            bold: "Удебелен",
+            italic: "Курсив",
+            underline: "Подчертан"
+        },
+        lists: {
+            unordered: "Неподреден списък",
+            ordered: "Подреден списък",
+            outdent: "Намали отстояние",
+            indent: "Увеличи отстояние"
+        },
+        link: {
+            insert: "Вмъкни връзка",
+            cancel: "Отмени"
+        },
+        image: {
+            insert: "Вмъкни картинка",
+            cancel: "Отмени"
+        },
+        html: {
+            edit: "Редакртирай HTML"
+        },
+        colours: {
+            black: "Черен",
+            silver: "Сребърен",
+            gray: "Сив",
+            maroon: "Коричневый",
+            red: "Червен",
+            purple: "Виолетов",
+            green: "Зелен",
+            olive: "Маслинен",
+            navy: "Морско син",
+            blue: "Син",
+            orange: "Оранжев"
+        }
+    };
+}(jQuery));
+

data/vendor/assets/javascripts/bootstrap-wysihtml5/locales/ko-KR.js

@@ -0,0 +1,49 @@
+/**
+ * Korean translation for bootstrap-wysihtml5
+ */
+(function($){
+    $.fn.wysihtml5.locale["ko-KR"] = {
+        font_styles: {
+            normal: "일반",
+            h1: "헤드라인 1",
+            h2: "헤드라인 2",
+            h3: "헤드라인 3"
+        },
+        emphasis: {
+            bold: "굵게",
+            italic: "기울게",
+            underline: "밑줄"
+        },
+        lists: {
+            unordered: "기호목록",
+            ordered: "숫자목록",
+            outdent: "내어쓰기",
+            indent: "들여쓰기"
+        },
+        link: {
+            insert: "링크 삽입",
+            cancel: "취소"
+        },
+        image: {
+            insert: "이미지 삽입",
+            cancel: "취소"
+        },
+        html: {
+            edit: "HTML 편집"
+        },
+        colours: {
+            black: "검은색",
+            silver: "은색",
+            gray: "회색",
+            maroon: "고동색",
+            red: "빨간색",
+            purple: "보라색",
+            green: "초록색",
+            olive: "올리브",
+            navy: "네이비",
+            blue: "파란색",
+            orange: "주황색"
+        }
+
+    };
+}(jQuery));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-wysihtml5-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1.13
+  version: 0.3.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -132,6 +132,7 @@ files:
 - testapp/vendor/plugins/.gitkeep
 - vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb
 - vendor/assets/javascripts/bootstrap-wysihtml5/index.js
+- vendor/assets/javascripts/bootstrap-wysihtml5/locales/bg-BG.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/ca-CT.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/cs-CZ.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/de-DE.js
@@ -144,6 +145,7 @@ files:
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/index.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/it-IT.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/ja-JP.js
+- vendor/assets/javascripts/bootstrap-wysihtml5/locales/ko-KR.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/lt-LT.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/mo-MD.js
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/nb-NB.js
@@ -172,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -442180742955728482
+      hash: -2396781461152925529
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -442180742955728482
+      hash: -2396781461152925529
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24