Changeset 1215

Timestamp:

11/09/09 02:39:07 (3 years ago)

Author:

gogo

Message:

Ticket #1189

Add the xml:lang attribute to LangMarks plugin.

The configuration for this plugin has changed, old configurations are accepted with a warning to the console.

By default BOTH lang="" and xml:lang="" are emitted for compatability, simply remove one or the other from the LangMarks.attributes array.

Xinha.Config.prototype.LangMarks = {
  'languages': [
    { name:"Greek",   code: "el" } ,
    { name:"English", code: "en" },
    { name:"French",  code: "fr" } ,
    { name:"Latin" ,  code: "la" }  
  ],
  
  'attributes': [
    'lang',
    'xml:lang'    
  ],
};

Location:

trunk/plugins/LangMarks

Files:

• LangMarks.js (modified) (6 diffs)
• lang-marks.css (modified) (2 diffs)

trunk/plugins/LangMarks/LangMarks.js

@@ -12 +12 @@
   var options = {};
   options[this._lc("— language —")] = '';
-        for (var i in cfg.LangMarks)
-        {
-                if (typeof i != 'string') continue;
-                options[this._lc(i)] = cfg.LangMarks[i];
+  
+  // Old configuration type
+  if(!cfg.LangMarks.languages)
+  {
+    Xinha.debugMsg('Warning: Old style LangMarks configuration detected, please update your LangMarks configuration.');
+    var newConfig = {
+      languages:  [],
+      attributes: Xinha.Config.prototype.attributes      
+    };
+    
+    for (var i in cfg.LangMarks)
+    {
+      if (typeof i != 'string') continue;
+      newConfig.languages.push( { name: i, code: cfg.LangMarks[i] } );      
+    }
+    
+    cfg.LangMarks = newConfig;
+  }
+  
+        for (var i = 0; i < cfg.LangMarks.languages.length; i++)
+        {               
+                options[this._lc(cfg.LangMarks.languages[i].name)] = cfg.LangMarks.languages[i].code;
         }
+  
 
   cfg.registerDropdown({
@@ -40 +59 @@
 
 Xinha.Config.prototype.LangMarks = {
-  "Greek" : "el",
-  "English" : "en",
-  "French" : "fr",
-  "Latin" : "la"
+  'languages': [
+    { name:"Greek",   code: "el" } ,
+    { name:"English", code: "en" },
+    { name:"French",  code: "fr" } ,
+    { name:"Latin" ,  code: "la" }  
+  ],
+  
+  'attributes': [
+    'lang',
+    'xml:lang'    
+  ],
 };
 
@@ -68 +94 @@
   if (update_parent) {
     parent.className = "haslang";
-    parent.lang = language;
+    parent.lang = language;    
+    
+    for(var i = 0; i < this.editor.config.LangMarks.attributes.length; i++)
+    {
+      parent.setAttribute(this.editor.config.LangMarks.attributes[i], language);
+    }
+    
     editor.updateToolbar();
     return;
@@ -87 +119 @@
       parent.className = "haslang";
       parent.lang = language;
+      
+      for(var i = 0; i < this.editor.config.LangMarks.attributes.length; i++)
+      {
+        parent.setAttribute(this.editor.config.LangMarks.attributes[i], language);
+      }
+            
       surround = false;
       // in this case we should handle the toolbar updation
@@ -100 +138 @@
     // it's dangerous when selection spans multiple block-level
     // elements.
-    editor.surroundHTML('<span lang="' + language + '" class="haslang">', '</span>');
+    var html = '';
+    for(var i = 0; i < this.editor.config.LangMarks.attributes.length; i++)
+    {
+      html += ' ' +this.editor.config.LangMarks.attributes[i] + '="'+language+'"';
+    }
+    
+    editor.surroundHTML('<span'+html+' class="haslang">', '</span>');
   }
 };
@@ -108 +152 @@
   var parents = editor.getAllAncestors();
   var parent;
+  var lang;
         for (var i=0;i<parents.length;i++)
         {
-                if (parents[i].lang) parent = parents[i];
+    for(var j = 0; j < editor.config.LangMarks.attributes.length; j++)
+    {      
+      if(parents[i].getAttribute(this.editor.config.LangMarks.attributes[j]))
+      {
+         parent = parents[i];      
+         lang = parents[i].getAttribute(this.editor.config.LangMarks.attributes[j]);                
+      }
+    }           
         }
         if (parent) {
     var options = select.options;
-    var value = parent.lang;
+    var value = lang;
     for (var i = options.length; --i >= 0;) {
       var option = options[i];

trunk/plugins/LangMarks/lang-marks.css

@@ -3 +3 @@
         white-space : nowrap;
 }
+
+
+
 span[lang]::after {
         content: attr(lang);
@@ -14 +17 @@
         vertical-align: top;
 }
+
+/*
+ * NOTE: The "proper" way to do this is with a CSS namespace
+ * @namespace xml "http://www.w3.org/XML/1998/namespace";
+ * and putting xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ * on the root <html> element or the <span> itself, then using 
+ * span[xml|lang] as the selector, but this simply doesn't work 
+ * in most browsers.  Which sucks.
+ */
+
+span[xml\:lang]::after {
+  content: attr(xml\:lang);
+  text-transform: uppercase;
+  font-family: sans-serif;
+  color: white;
+  background: red;
+  border: 1px solid red;
+  font-size: x-small;
+  font-weight: normal;
+  vertical-align: top;
+}
+