bootstrap-wysihtml5-rails 0.2.12 → 0.3.0

data/Rakefile

@@ -7,21 +7,10 @@ task 'update' do
   system("git clone git://github.com/jhollingworth/bootstrap-wysihtml5.git")
   system("cp bootstrap-wysihtml5/src/bootstrap-wysihtml5.css vendor/assets/stylesheets/bootstrap-wysihtml5.css")
   system("cp bootstrap-wysihtml5/src/bootstrap-wysihtml5.js vendor/assets/javascripts/bootstrap-wysihtml5.js")
-  system("cp bootstrap-wysihtml5/lib/js/wysihtml5-0.3.0_rc3.js vendor/assets/javascripts/wysihtml5.js")
+  system("cp bootstrap-wysihtml5/lib/js/wysihtml5-0.3.0.js vendor/assets/javascripts/wysihtml5.js")
   system("git status")
 end
 
-desc "Build the gem"
-task "build" do
-  system("gem build bootstrap-wysihtml5-rails.gemspec")
-end
-
-desc "Publish the gem"
-task 'publish' do
-  system("gem push bootstrap-wysihtml5-rails-#{BootstrapWysihtml5Rails::Rails::VERSION}.gem")
-  system("git push")
-end
-
 desc "Release a new version"
 task "release" do
   system("gem build bootstrap-wysihtml5-rails.gemspec")

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

@@ -1,5 +1,5 @@
 module BootstrapWysihtml5Rails
   module Rails
-    VERSION = "0.2.12"
+    VERSION = "0.3.0"
   end
 end

data/vendor/assets/javascripts/wysihtml5.js

@@ -1,5 +1,5 @@
 /**
- * @license wysihtml5 v0.3.0_rc3
+ * @license wysihtml5 v0.3.0
  * https://github.com/xing/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -9,7 +9,7 @@
  *
  */
 var wysihtml5 = {
-  version: "0.3.0_rc3",
+  version: "0.3.0",
   
   // namespaces
   commands:   {},
@@ -3557,8 +3557,8 @@ wysihtml5.browser = (function() {
          // When inserting unordered or ordered lists in Firefox, Chrome or Safari, the current selection or line gets
          // converted into a list (<ul><li>...</li></ul>, <ol><li>...</li></ol>)
          // IE and Opera act a bit different here as they convert the entire content of the current block element into a list
-        "insertUnorderedList":  isIE || isOpera,
-        "insertOrderedList":    isIE || isOpera
+        "insertUnorderedList":  isIE || isOpera || isWebKit,
+        "insertOrderedList":    isIE || isOpera || isWebKit
       };
       
       // Firefox throws errors for queryCommandSupported, so we have to build up our own object of supported commands
@@ -4148,18 +4148,38 @@ wysihtml5.dom.convertToList = (function() {
     
     var doc               = element.ownerDocument,
         list              = _createList(doc, listType),
-        childNodes        = wysihtml5.lang.array(element.childNodes).get(),
-        childNodesLength  = childNodes.length,
+        lineBreaks        = element.querySelectorAll("br"),
+        lineBreaksLength  = lineBreaks.length,
+        childNodes,
+        childNodesLength,
         childNode,
+        lineBreak,
+        parentNode,
         isBlockElement,
         isLineBreak,
         currentListItem,
-        i                 = 0;
-    for (; i<childNodesLength; i++) {
-      currentListItem = currentListItem || _createListItem(doc, list);
-      childNode       = childNodes[i];
-      isBlockElement  = wysihtml5.dom.getStyle("display").from(childNode) === "block";
-      isLineBreak     = childNode.nodeName === "BR";
+        i;
+    
+    // First find <br> at the end of inline elements and move them behind them
+    for (i=0; i<lineBreaksLength; i++) {
+      lineBreak = lineBreaks[i];
+      while ((parentNode = lineBreak.parentNode) && parentNode !== element && parentNode.lastChild === lineBreak) {
+        if (wysihtml5.dom.getStyle("display").from(parentNode) === "block") {
+          parentNode.removeChild(lineBreak);
+          break;
+        }
+        wysihtml5.dom.insert(lineBreak).after(lineBreak.parentNode);
+      }
+    }
+    
+    childNodes        = wysihtml5.lang.array(element.childNodes).get();
+    childNodesLength  = childNodes.length;
+    
+    for (i=0; i<childNodesLength; i++) {
+      currentListItem   = currentListItem || _createListItem(doc, list);
+      childNode         = childNodes[i];
+      isBlockElement    = wysihtml5.dom.getStyle("display").from(childNode) === "block";
+      isLineBreak       = childNode.nodeName === "BR";
       
       if (isBlockElement) {
         // Append blockElement to current <li> if empty, otherwise create a new one
@@ -4208,7 +4228,7 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
               length    = attributesToCopy.length;
           for (; i<length; i++) {
             attribute = attributesToCopy[i];
-            if (elementToCopyFrom[attribute]) {
+            if (typeof(elementToCopyFrom[attribute]) !== "undefined" && elementToCopyFrom[attribute] !== "") {
               elementToCopyTo[attribute] = elementToCopyFrom[attribute];
             }
           }
@@ -5242,7 +5262,7 @@ wysihtml5.dom.replaceWithChildNodes = function(node) {
     
     var doc             = list.ownerDocument,
         fragment        = doc.createDocumentFragment(),
-        previousSibling = list.previousSibling,
+        previousSibling = list.previousElementSibling || list.previousSibling,
         firstChild,
         lastChild,
         isLastChild,
@@ -6762,21 +6782,23 @@ wysihtml5.Commands = Base.extend(
   exec: function(command, value) {
     var obj     = wysihtml5.commands[command],
         args    = wysihtml5.lang.array(arguments).get(),
-        method  = obj && obj.exec;
+        method  = obj && obj.exec,
+        result  = null;
     
     this.editor.fire("beforecommand:composer");
     
     if (method) {
       args.unshift(this.composer);
-      return method.apply(obj, args);
+      result = method.apply(obj, args);
     } else {
       try {
         // try/catch for buggy firefox
-        return this.doc.execCommand(command, false, value);
+        result = this.doc.execCommand(command, false, value);
       } catch(e) {}
     }
     
     this.editor.fire("aftercommand:composer");
+    return result;
   },
   
   /**
@@ -6828,7 +6850,8 @@ wysihtml5.Commands = Base.extend(
       }
     }
   }
-});(function(wysihtml5) {
+});
+(function(wysihtml5) {
   var undef;
   
   wysihtml5.commands.bold = {
@@ -7472,55 +7495,52 @@ wysihtml5.Commands = Base.extend(
   
   wysihtml5.commands.insertOrderedList = {
     exec: function(composer, command) {
-      var doc = composer.doc,
-          selectedNode,
+      var doc           = composer.doc,
+          selectedNode  = composer.selection.getSelectedNode(),
+          list          = wysihtml5.dom.getParentElement(selectedNode, { nodeName: "OL" }),
+          otherList     = wysihtml5.dom.getParentElement(selectedNode, { nodeName: "UL" }),
+          tempClassName =  "_wysihtml5-temp-" + new Date().getTime(),
           isEmpty,
-          tempElement,
-          list;
-
+          tempElement;
+      
       if (composer.commands.support(command)) {
         doc.execCommand(command, false, null);
+        return;
+      }
+      
+      if (list) {
+        // Unwrap list
+        // <ol><li>foo</li><li>bar</li></ol>
+        // becomes:
+        // foo<br>bar<br>
+        composer.selection.executeAndRestoreSimple(function() {
+          wysihtml5.dom.resolveList(list);
+        });
+      } else if (otherList) {
+        // Turn an unordered list into an ordered list
+        // <ul><li>foo</li><li>bar</li></ul>
+        // becomes:
+        // <ol><li>foo</li><li>bar</li></ol>
+        composer.selection.executeAndRestoreSimple(function() {
+          wysihtml5.dom.renameElement(otherList, "ol");
+        });
       } else {
-        selectedNode = composer.selection.getSelectedNode();
-        list = wysihtml5.dom.getParentElement(selectedNode, { nodeName: ["UL", "OL"] }, 4);
-        if (!list) {
-          tempElement = doc.createElement("span");
-          composer.selection.surround(tempElement);
-          isEmpty = tempElement.innerHTML === "" || tempElement.innerHTML === wysihtml5.INVISIBLE_SPACE;
-          composer.selection.executeAndRestoreSimple(function() {
-            list = wysihtml5.dom.convertToList(tempElement, "ol");
-          });
-
-          if (isEmpty) {
-            composer.selection.selectNode(list.querySelector("li"));
-          }
-          return;
-        }
-
+        // Create list
+        composer.commands.exec("formatBlock", "div", tempClassName);
+        tempElement = doc.querySelector("." + tempClassName);
+        isEmpty = tempElement.innerHTML === "" || tempElement.innerHTML === wysihtml5.INVISIBLE_SPACE;
         composer.selection.executeAndRestoreSimple(function() {
-          if (list.nodeName === "OL") {
-            // Unwrap list
-            // <ol><li>foo</li><li>bar</li></ol>
-            // becomes:
-            // foo<br>bar<br>
-            wysihtml5.dom.resolveList(list);
-          } else if (list.nodeName === "UL" || list.nodeName === "MENU") {
-            // Turn an unordered list into an ordered list
-            // <ul><li>foo</li><li>bar</li></ul>
-            // becomes:
-            // <ol><li>foo</li><li>bar</li></ol>
-            wysihtml5.dom.renameElement(list, "ol");
-          }
+          list = wysihtml5.dom.convertToList(tempElement, "ol");
         });
+        if (isEmpty) {
+          composer.selection.selectNode(list.querySelector("li"));
+        }
       }
     },
-
-    state: function(composer, command) {
-      try {
-        return composer.doc.queryCommandState(command);
-      } catch(e) {
-        return false;
-      }
+    
+    state: function(composer) {
+      var selectedNode = composer.selection.getSelectedNode();
+      return wysihtml5.dom.getParentElement(selectedNode, { nodeName: "OL" });
     },
 
     value: function() {
@@ -7532,56 +7552,52 @@ wysihtml5.Commands = Base.extend(
   
   wysihtml5.commands.insertUnorderedList = {
     exec: function(composer, command) {
-      var doc = composer.doc,
-          selectedNode,
+      var doc           = composer.doc,
+          selectedNode  = composer.selection.getSelectedNode(),
+          list          = wysihtml5.dom.getParentElement(selectedNode, { nodeName: "UL" }),
+          otherList     = wysihtml5.dom.getParentElement(selectedNode, { nodeName: "OL" }),
+          tempClassName =  "_wysihtml5-temp-" + new Date().getTime(),
           isEmpty,
-          tempElement,
-          list;
-
+          tempElement;
+      
       if (composer.commands.support(command)) {
         doc.execCommand(command, false, null);
+        return;
+      }
+      
+      if (list) {
+        // Unwrap list
+        // <ul><li>foo</li><li>bar</li></ul>
+        // becomes:
+        // foo<br>bar<br>
+        composer.selection.executeAndRestoreSimple(function() {
+          wysihtml5.dom.resolveList(list);
+        });
+      } else if (otherList) {
+        // Turn an ordered list into an unordered list
+        // <ol><li>foo</li><li>bar</li></ol>
+        // becomes:
+        // <ul><li>foo</li><li>bar</li></ul>
+        composer.selection.executeAndRestoreSimple(function() {
+          wysihtml5.dom.renameElement(otherList, "ul");
+        });
       } else {
-        selectedNode = composer.selection.getSelectedNode();
-        list = wysihtml5.dom.getParentElement(selectedNode, { nodeName: ["UL", "OL"] });
-
-        if (!list) {
-          tempElement = doc.createElement("span");
-          composer.selection.surround(tempElement);
-          isEmpty = tempElement.innerHTML === "" || tempElement.innerHTML === wysihtml5.INVISIBLE_SPACE;
-          composer.selection.executeAndRestoreSimple(function() {
-            list = wysihtml5.dom.convertToList(tempElement, "ul");
-          });
-
-          if (isEmpty) {
-            composer.selection.selectNode(list.querySelector("li"));
-          }
-          return;
-        }
-
+        // Create list
+        composer.commands.exec("formatBlock", "div", tempClassName);
+        tempElement = doc.querySelector("." + tempClassName);
+        isEmpty = tempElement.innerHTML === "" || tempElement.innerHTML === wysihtml5.INVISIBLE_SPACE;
         composer.selection.executeAndRestoreSimple(function() {
-          if (list.nodeName === "UL") {
-            // Unwrap list
-            // <ul><li>foo</li><li>bar</li></ul>
-            // becomes:
-            // foo<br>bar<br>
-            wysihtml5.dom.resolveList(list);
-          } else if (list.nodeName === "OL" || list.nodeName === "MENU") {
-            // Turn an ordered list into an unordered list
-            // <ol><li>foo</li><li>bar</li></ol>
-            // becomes:
-            // <ul><li>foo</li><li>bar</li></ul>
-            wysihtml5.dom.renameElement(list, "ul");
-          }
+          list = wysihtml5.dom.convertToList(tempElement, "ul");
         });
+        if (isEmpty) {
+          composer.selection.selectNode(list.querySelector("li"));
+        }
       }
     },
-
-    state: function(composer, command) {
-      try {
-        return composer.doc.queryCommandState(command);
-      } catch(e) {
-        return false;
-      }
+    
+    state: function(composer) {
+      var selectedNode = composer.selection.getSelectedNode();
+      return wysihtml5.dom.getParentElement(selectedNode, { nodeName: "UL" });
     },
 
     value: function() {
@@ -8543,7 +8559,7 @@ wysihtml5.views.View = Base.extend(
     dom.observe(element, "keydown", function(event) {
       var keyCode  = event.keyCode,
           command  = shortcuts[keyCode];
-      if ((event.ctrlKey || event.metaKey) && command) {
+      if ((event.ctrlKey || event.metaKey) && !event.altKey && command) {
         that.commands.exec(command);
         event.preventDefault();
       }
@@ -8581,9 +8597,11 @@ wysihtml5.views.View = Base.extend(
       if (nodeName !== "A" && nodeName !== "IMG") {
         return;
       }
-
-      title = titlePrefixes[nodeName] + (target.getAttribute("href") || target.getAttribute("src"));
-      target.setAttribute("title", title);
+      var hasTitle = target.hasAttribute("title");
+      if(!hasTitle){
+        title = titlePrefixes[nodeName] + (target.getAttribute("href") || target.getAttribute("src"));
+        target.setAttribute("title", title);
+      }
     });
   };
 })(wysihtml5);/**
@@ -9047,6 +9065,7 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
   var CLASS_NAME_COMMAND_DISABLED   = "wysihtml5-command-disabled",
       CLASS_NAME_COMMANDS_DISABLED  = "wysihtml5-commands-disabled",
       CLASS_NAME_COMMAND_ACTIVE     = "wysihtml5-command-active",
+      CLASS_NAME_ACTION_ACTIVE      = "wysihtml5-action-active",
       dom                           = wysihtml5.dom;
   
   wysihtml5.toolbar.Toolbar = Base.extend(
@@ -9071,11 +9090,12 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
     },
 
     _getLinks: function(type) {
-      var links   = this[type + "Links"] = wysihtml5.lang.array(this.container.querySelectorAll("a[data-wysihtml5-" + type + "]")).get(),
+      var links   = this[type + "Links"] = wysihtml5.lang.array(this.container.querySelectorAll("[data-wysihtml5-" + type + "]")).get(),
           length  = links.length,
           i       = 0,
           mapping = this[type + "Mapping"] = {},
           link,
+          group,
           name,
           value,
           dialog;
@@ -9083,10 +9103,12 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
         link    = links[i];
         name    = link.getAttribute("data-wysihtml5-" + type);
         value   = link.getAttribute("data-wysihtml5-" + type + "-value");
+        group   = this.container.querySelector("[data-wysihtml5-" + type + "-group='" + name + "']");
         dialog  = this._getDialog(link, name);
         
         mapping[name + ":" + value] = {
           link:   link,
+          group:  group,
           name:   name,
           value:  value,
           dialog: dialog,
@@ -9234,8 +9256,10 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
     _updateLinkStates: function() {
       var element           = this.composer.element,
           commandMapping    = this.commandMapping,
+          actionMapping     = this.actionMapping,
           i,
           state,
+          action,
           command;
       // every millisecond counts... this is executed quite often
       for (i in commandMapping) {
@@ -9243,6 +9267,9 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
         if (this.commandsDisabled) {
           state = false;
           dom.removeClass(command.link, CLASS_NAME_COMMAND_ACTIVE);
+          if (command.group) {
+            dom.removeClass(command.group, CLASS_NAME_COMMAND_ACTIVE);
+          }
           if (command.dialog) {
             command.dialog.hide();
           }
@@ -9256,6 +9283,9 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
             state = state.length === 1 ? state[0] : true;
           }
           dom.removeClass(command.link, CLASS_NAME_COMMAND_DISABLED);
+          if (command.group) {
+            dom.removeClass(command.group, CLASS_NAME_COMMAND_DISABLED);
+          }
         }
 
         if (command.state === state) {
@@ -9265,6 +9295,9 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
         command.state = state;
         if (state) {
           dom.addClass(command.link, CLASS_NAME_COMMAND_ACTIVE);
+          if (command.group) {
+            dom.addClass(command.group, CLASS_NAME_COMMAND_ACTIVE);
+          }
           if (command.dialog) {
             if (typeof(state) === "object") {
               command.dialog.show(state);
@@ -9274,11 +9307,27 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
           }
         } else {
           dom.removeClass(command.link, CLASS_NAME_COMMAND_ACTIVE);
+          if (command.group) {
+            dom.removeClass(command.group, CLASS_NAME_COMMAND_ACTIVE);
+          }
           if (command.dialog) {
             command.dialog.hide();
           }
         }
       }
+      
+      for (i in actionMapping) {
+        action = actionMapping[i];
+        
+        if (action.name === "change_view") {
+          action.state = this.editor.currentView === this.editor.textarea;
+          if (action.state) {
+            dom.addClass(action.link, CLASS_NAME_ACTION_ACTIVE);
+          } else {
+            dom.removeClass(action.link, CLASS_NAME_ACTION_ACTIVE);
+          }
+        }
+      }
     },
 
     show: function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-wysihtml5-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 102149792187236316
+      hash: -599525991395027129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 102149792187236316
+      hash: -599525991395027129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24