Ticket #1541: formatblock.2.diff

XinhaCore.js

@@ -1058 +1058 @@
     "Address"  : "address",
     "Formatted": "pre"
   };
-  
+
+  this.formatblockDetector = {};
+
   this.dialogOptions =
   { 
     'centered' : true, //true: dialog is shown in the center the screen, false dialog is shown near the clicked toolbar button
@@ -4901 +4903 @@
         var blocks = [];
         for ( var indexBlock in this.config.formatblock )
         {
+          var blockname = this.config.formatblock[indexBlock];
           // prevent iterating over wrong type
-          if ( typeof this.config.formatblock[indexBlock] == 'string' )
+          if ( typeof blockname  == 'string' )
           {
-            blocks[blocks.length] = this.config.formatblock[indexBlock];
+            blocks[blocks.length] = this.config.formatblockDetector[blockname] || blockname;
           }
         }
 
-        var deepestAncestor = this._getFirstAncestor(this.getSelection(), blocks);
+        var match = this._getFirstAncestorAndWhy(this.getSelection(), blocks);
+        var deepestAncestor = match[0];
+        var matchIndex = match[1];
         if ( deepestAncestor )
         {
-          for ( var x = 0; x < blocks.length; x++ )
-          {
-            if ( blocks[x].toLowerCase() == deepestAncestor.tagName.toLowerCase() )
-            {
-              btn.element.selectedIndex = x;
-            }
-          }
+          btn.element.selectedIndex = matchIndex;
         }
         else
         {
@@ -5047 +5046 @@
  */
 Xinha.prototype._getFirstAncestor = function(sel, types)
 {
+  return this._getFirstAncestorAndWhy(sel, types)[0];
+};
+
+// same as above, but also returns index into types array of match
+Xinha.prototype._getFirstAncestorAndWhy = function(sel, types)
+{
   var prnt = this.activeElement(sel);
   if ( prnt === null )
   {
@@ -5057 +5062 @@
     }
     catch(ex)
     {
-      return null;
+      return [null, null];
     }
   }
 
@@ -5072 +5077 @@
     {
       if ( types === null )
       {
-        return prnt;
+        return [prnt, null];
       }
       for (var index=0; index<types.length; ++index) {
         if (typeof types[index] == 'string' && types[index] == prnt.tagName.toLowerCase()){
           // Criteria is a tag name.  It matches
-        return prnt;
+          return [prnt, index];
       }
         else if (typeof types[index] == 'function' && types[index](this, prnt)) {
           // Criteria is a callback.  It matches
-          return prnt;
+          return [prnt, index];
         }
       }
 
@@ -5097 +5102 @@
     prnt = prnt.parentNode;
   }
 
-  return null;
+  return [null, null];
 };
 
 /** Traverses the DOM upwards and returns the first element that is a block level element
@@ -5221 +5226 @@
       this.execCommand(txt, false, value);
     break;
     case "formatblock":
-      // Mozilla inserts an empty tag (<>) if no parameter is passed  
+      // Mozilla inserts an empty tag (<>) if no parameter is passed
       if ( !value )
       {
         this.updateToolbar();