bootstrap-wysihtml5-rails 0.3.1.19 → 0.3.1.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d677d6beb4229ec2375734e26167982487ab36b4
+  data.tar.gz: a939716fc1d9a0c4d3d7c6aa6e548d0a8223778a
+SHA512:
+  metadata.gz: 3b36d07ef7da14c6e60610edc494ba4678c250597367a8d10fc63fa284030a8e1f7d40b1ed29d22321a8650ede1054a93dfe6e0fc3b96aaf1b2f8765bd92ef9b
+  data.tar.gz: 773601b3cd8422c10ca29ebd4e614fffa8f7ef26468d6c2d203cab779304be00874caeb2a4e8804472dccde0b01b0c24d801aad2a6206fc5d1a25d762aa9c787

data/.rvmrc

@@ -5,11 +5,11 @@
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p327@bootstrap-wysihtml5"
+#     echo "rvm use 2.0.0" > .rvmrc
+environment_id="ruby-2.0.0-p0@bootstrap-wysihtml5-rails"
 
 # Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.17.0 (master)" # 1.10.1 seams as a safe start
+# rvmrc_rvm_version="1.19.0 (master)" # 1.10.1 seams as a safe start
 # eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
 #   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
 #   return 1
@@ -23,8 +23,13 @@ if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
   && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
 then
   \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
+  do
+    if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
+    then \. "${__hook}" || true
+    fi
+  done
+  unset __hook
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
   rvm --create  "$environment_id" || {

data/README.md

@@ -34,21 +34,14 @@ This gem doesn't include Bootstrap. You can get Bootstrap here: https://github.c
 
 ## Configuration
 
-app/assets/stylesheets/application.css
+Bootstrap-wysihtml5 depends on jquery and bootstrap.
 
+app/assets/stylesheets/application.css
 ``` css
 *= require bootstrap-wysihtml5
 ```
 
-Bootstrap-wysihtml5 depends on jquery and bootstrap-button. Make sure to require it in the manifest file.
-
-``` javascript
-//= require jquery            # Not included
-//= require bootstrap-button  # Not included
-```
-
-Add necessary javascript(s) files to app/assets/javascripts/application.js
-
+app/assets/javascripts/application.js
 ```javascript
 //= require bootstrap-wysihtml5
 

data/Rakefile

@@ -8,8 +8,11 @@ task 'update' do
   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")
+  if Dir.exist?('bootstrap-wysihtml5')
+    system("cd bootstrap-wysihtml5 && git pull && cd ..")
+  else
+    system("git clone git://github.com/jhollingworth/bootstrap-wysihtml5.git bootstrap-wysihtml5")
+  end
 
   system("cp #{origin_src_path}/bootstrap-wysihtml5.css #{dest_css_path}/core.css")
 
@@ -42,6 +45,8 @@ end
 
 desc "Publish a new version"
 task :publish => :build do
+  tags = `git tag`.split
+  system("git tag #{BootstrapWysihtml5Rails::Rails::VERSION}") unless tags.include?(BootstrapWysihtml5Rails::Rails::VERSION)
   system("gem push bootstrap-wysihtml5-rails-#{BootstrapWysihtml5Rails::Rails::VERSION}.gem")
   system("git push")
 end

data/lib/bootstrap-wysihtml5-rails.rb

@@ -3,10 +3,10 @@ require "bootstrap-wysihtml5-rails/version"
 
 module BootstrapWysihtml5Rails
   module Rails
-    if ::Rails.version < "3.1"
+    if ::Rails.version.to_s < "3.1"
       require "bootstrap-wysihtml5-rails/railtie"
     else
       require "bootstrap-wysihtml5-rails/engine"
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module BootstrapWysihtml5Rails
   module Rails
-    VERSION = "0.3.1.19"
+    VERSION = "0.3.1.20"
   end
 end

data/testapp/app/assets/javascripts/application.js

@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
 //= require twitter/bootstrap
 //= require bootstrap-wysihtml5
+//= require_tree .
+//= require_self

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

@@ -13,6 +13,9 @@
                 "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1' tabindex='-1'>" + locale.font_styles.h1 + "</a></li>" +
                 "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2' tabindex='-1'>" + locale.font_styles.h2 + "</a></li>" +
                 "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' tabindex='-1'>" + locale.font_styles.h3 + "</a></li>" +
+                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h4'>" + locale.font_styles.h4 + "</a></li>" +
+                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h5'>" + locale.font_styles.h5 + "</a></li>" +
+                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h6'>" + locale.font_styles.h6 + "</a></li>" +
               "</ul>" +
             "</li>";
         },
@@ -50,6 +53,7 @@
                 "</div>" +
                 "<div class='modal-body'>" +
                   "<input value='http://' class='bootstrap-wysihtml5-insert-link-url input-xlarge'>" +
+                  "<label class='checkbox'> <input type='checkbox' class='bootstrap-wysihtml5-insert-link-target' checked>" + locale.link.target + "</label>" +
                 "</div>" +
                 "<div class='modal-footer'>" +
                   "<a href='#' class='btn' data-dismiss='modal'>" + locale.link.cancel + "</a>" +
@@ -282,6 +286,7 @@
             var self = this;
             var insertLinkModal = toolbar.find('.bootstrap-wysihtml5-insert-link-modal');
             var urlInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-url');
+            var targetInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-target');
             var insertButton = insertLinkModal.find('a.btn-primary');
             var initialValue = urlInput.val();
             var caretBookmark;
@@ -294,10 +299,12 @@
                   self.editor.composer.selection.setBookmark(caretBookmark);
                   caretBookmark = null;
                 }
+
+                var newWindow = targetInput.prop("checked");
                 self.editor.composer.commands.exec("createLink", {
-                    href: url,
-                    target: "_blank",
-                    rel: "nofollow"
+                    'href' : url,
+                    'target' : (newWindow ? '_blank' : '_self'),
+                    'rel' : (newWindow ? 'nofollow' : '')
                 });
             };
             var pressedEnter = false;
@@ -350,7 +357,7 @@
             });
         },
         shallowExtend: function (options) {
-            var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {});
+            var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {}, $(this).data());
             var that = this;
             return methods.bypassDefaults.apply(that, [settings]);
         },
@@ -416,6 +423,9 @@
                 "h1": {},
                 "h2": {},
                 "h3": {},
+                "h4": {},
+                "h5": {},
+                "h6": {},
                 "blockquote": {},
                 "u": 1,
                 "img": {
@@ -427,12 +437,10 @@
                     }
                 },
                 "a":  {
-                    set_attributes: {
-                        target: "_blank",
-                        rel:    "nofollow"
-                    },
                     check_attributes: {
-                        href:   "url" // important to avoid XSS
+                        'href': "url", // important to avoid XSS
+                        'target': 'alt',
+                        'rel': 'alt'
                     }
                 },
                 "span": 1,
@@ -456,7 +464,10 @@
                 normal: "Normal text",
                 h1: "Heading 1",
                 h2: "Heading 2",
-                h3: "Heading 3"
+                h3: "Heading 3",
+                h4: "Heading 4",
+                h5: "Heading 5",
+                h6: "Heading 6"
             },
             emphasis: {
                 bold: "Bold",
@@ -471,7 +482,8 @@
             },
             link: {
                 insert: "Insert link",
-                cancel: "Cancel"
+                cancel: "Cancel",
+                target: "Open link in new window"
             },
             image: {
                 insert: "Insert image",

data/vendor/assets/javascripts/bootstrap-wysihtml5/locales/de-DE.js

@@ -22,7 +22,8 @@
         },
         link: {
             insert: "Link einfügen",
-            cancel: "Abbrechen"
+            cancel: "Abbrechen",
+            target: "Link in neuen Fenster öffnen"
         },
         image: {
             insert: "Bild einfügen",

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-wysihtml5-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1.19
-  prerelease: 
+  version: 0.3.1.20
 platform: ruby
 authors:
 - Gonzalo Rodríguez-Baltanás Díaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A wysiwyg text editor for Twitter Bootstrap
@@ -168,32 +161,25 @@ files:
 - vendor/assets/stylesheets/bootstrap-wysihtml5/wysiwyg-color.css
 homepage: https://github.com/Nerian/bootstrap-wysihtml5-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1845273924155229667
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1845273924155229667
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A wysiwyg text editor for Twitter Bootstrap
 test_files: []