bootsy 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c76b46b43c59c11ae610157bb89a833de61fff
-  data.tar.gz: a1fa27d625b2f313fdf30de95e94ea97b11f8862
+  metadata.gz: e3fa1e33cc474133f385772500c3f1c3c7c622d4
+  data.tar.gz: 477c5ad9e850218869fc3f68c93fed33ed90d045
 SHA512:
-  metadata.gz: f826930f5425b4fcf2be6d85a4ac983a997b094b64d3afac82a0184d9a773835bef03262531b41c10225228ea37ffbe23f2c603ff1978bd0f2859ec4cdfb0202
-  data.tar.gz: 51a5e794cebc1940982c7e1aa0e374a6013f38e1f27871ff00e923b723e83f5e29021ddfa9c68f28ea961e1af6fdcdb689cd50fb22eaf7b8f80f7804b24dd866
+  metadata.gz: 74a7ec62cbfb633d74b83d4c9e8ba97c74d1d605a2ca4b556acba3e4fad8b66d1d5548a3150196928ac26a96345dbc32ff38dd54c7d1f9e16ff15f194d7b016d
+  data.tar.gz: cc39af7ac32035dec2c52384d06d0aca6f40bca12926b89f8ee5b963e7282949cbb637854ac8d0eb067456efe0866c79334bf849be0faf09ea1f97d854ef8f0c

data/app/assets/javascripts/bootsy/bootstrap-wysihtml5.js

@@ -143,6 +143,10 @@
 
         createEditor: function(options) {
             options = options || {};
+            
+            // Add the toolbar to a clone of the options object so multiple instances
+            // of the WYISYWG don't break because "toolbar" is already defined
+            options = $.extend(true, {}, options);
             options.toolbar = this.toolbar[0];
 
             var editor = new wysi.Editor(this.el[0], options);
@@ -266,7 +270,7 @@
                 if (!activeButton) {
                     self.editor.currentView.element.focus(false);
                     caretBookmark = self.editor.composer.selection.getBookmark();
-                    insertImageModal.modal('show');
+                    insertImageModal.appendTo('body').modal('show');
                     insertImageModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
                         e.stopPropagation();
                     });
@@ -453,7 +457,10 @@
                     }
                 },
                 "span": 1,
-                "div": 1
+                "div": 1,
+                // to allow save and edit files with code tag hacks
+                "code": 1,
+                "pre": 1
             }
         },
         stylesheets: ["./lib/css/wysiwyg-color.css"], // (path_to_project/lib/css/wysiwyg-color.css)

data/app/assets/javascripts/bootsy/bootsy.js

@@ -74,13 +74,40 @@ window.Bootsy = (function(){
       Bootsy.editorOptions = {
         parserRules: {
           classes: {
+            "wysiwyg-color-silver" : 1,
+            "wysiwyg-color-gray" : 1,
+            "wysiwyg-color-white" : 1,
+            "wysiwyg-color-maroon" : 1,
+            "wysiwyg-color-red" : 1,
+            "wysiwyg-color-purple" : 1,
+            "wysiwyg-color-fuchsia" : 1,
+            "wysiwyg-color-green" : 1,
+            "wysiwyg-color-lime" : 1,
+            "wysiwyg-color-olive" : 1,
+            "wysiwyg-color-yellow" : 1,
+            "wysiwyg-color-navy" : 1,
+            "wysiwyg-color-blue" : 1,
+            "wysiwyg-color-teal" : 1,
+            "wysiwyg-color-aqua" : 1,
+            "wysiwyg-color-orange" : 1,
             "wysiwyg-float-left": 1,
             "wysiwyg-float-right": 1
           },
 
           tags: {
+            "b":  {},
+            "i":  {},
+            "br": {},
+            "ol": {},
+            "ul": {},
+            "li": {},
+            "h1": {},
+            "h2": {},
+            "h3": {},
             "small": {},
             "p": {},
+            "blockquote": {},
+            "u": 1,
             "cite": {
               "check_attributes": {
                 "title": "alt"
@@ -88,12 +115,30 @@ window.Bootsy = (function(){
             },
             "img": {
               "check_attributes": {
-                "src": "src"
+                "width": "numbers",
+                "alt": "alt",
+                "src": "src",
+                "height": "numbers"
               },
               "add_class": {
                 "align": "align_img"
               }
             },
+
+            "a":  {
+              set_attributes: {
+                target: "_blank",
+                rel:    "nofollow"
+              },
+              check_attributes: {
+                href:   "url" // important to avoid XSS
+              }
+            },
+            "span": 1,
+            "div": 1,
+            // to allow save and edit files with code tag hacks
+            "code": 1,
+            "pre": 1
           }
         },
         color: true, 

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick