Changeset 1044

Timestamp:

10/02/08 12:07:26 (2 months ago)

Author:

douglas

Message:

FIXED Ticket #1176 Merging new dialogs branch back to trunk.

Location:

trunk

Files:

• Xinha.css (modified) (6 diffs)
• XinhaCore.js (modified) (18 diffs)
• modules/ColorPicker/ColorPicker.js (modified) (1 diff)
• modules/CreateLink/dialog.html (added)
• modules/CreateLink/link.js (modified) (4 diffs)
• modules/CreateLink/pluginMethods.js (added)
• modules/Dialogs/XinhaDialog.js (added)
• modules/Dialogs/inline-dialog.js (deleted)
• modules/Gecko/Gecko.js (modified) (3 diffs)
• modules/InlineStyler (added)
• modules/InlineStyler/InlineStyler.js (added)
• modules/InsertImage/dialog.html (added)
• modules/InsertImage/insert_image.js (modified) (3 diffs)
• modules/InsertImage/pluginMethods.js (added)
• modules/InsertTable/dialog.html (added)
• modules/InsertTable/insert_table.js (modified) (2 diffs)
• modules/InsertTable/pluginMethods.js (added)
• modules/InternetExplorer/InternetExplorer.js (modified) (5 diffs)
• modules/Opera/Opera.js (modified) (2 diffs)
• modules/WebKit/WebKit.js (modified) (3 diffs)
• plugins/Abbreviation/abbreviation.js (modified) (2 diffs)
• plugins/Abbreviation/dialog.html (added)
• plugins/Abbreviation/popups (deleted)
• plugins/BackgroundImage/background-image.js (modified) (1 diff)
• plugins/BackgroundImage/dialog.html (added)
• plugins/BackgroundImage/popups (deleted)
• plugins/CharacterMap/CharacterMap.css (modified) (1 diff)
• plugins/CharacterMap/character-map.js (modified) (3 diffs)
• plugins/InsertAnchor/dialog.html (added)
• plugins/InsertAnchor/insert-anchor.js (modified) (5 diffs)
• plugins/Linker/linker.js (modified) (1 diff)
• plugins/Linker/pluginMethods.js (added)
• plugins/PasteText/lang/de.js (modified) (1 diff)
• plugins/PasteText/paste-text.js (modified) (3 diffs)
• plugins/PasteText/popups/paste_text.html (modified) (1 diff)
• plugins/SmartReplace/dialog.html (modified) (1 diff)
• plugins/SmartReplace/smart-replace.js (modified) (7 diffs)
• plugins/Stylist/stylist.js (modified) (6 diffs)
• plugins/SuperClean/dialog.html (modified) (1 diff)
• plugins/SuperClean/lang/de.js (modified) (1 diff)
• plugins/SuperClean/pluginMethods.js (added)
• plugins/SuperClean/super-clean.js (modified) (6 diffs)
• plugins/TableOperations/popups/dialogMergeCells.html (added)
• plugins/TableOperations/popups/dialogRowCell.html (added)
• plugins/TableOperations/popups/dialogTable.html (added)
• plugins/TableOperations/table-operations.js (modified) (20 diffs)
• plugins/UnFormat/dialog.html (added)
• plugins/UnFormat/popups (deleted)
• plugins/UnFormat/un-format.js (modified) (3 diffs)

trunk/Xinha.css

@@ -114 +114 @@
 .dialog {
   color: ButtonText;
-  background: ButtonFace;
-}
-
+  background: ButtonFace; 
+  border: 1px outset; 
+  border-color: WindowFrame;
+}
+div.dialog {
+  padding-bottom:10px;
+}
+.xinha_dialog_background {
+  filter: alpha(opacity=0);
+  -moz-opacity: 0;
+  opacity: 0;
+  border:none;
+}
+.xinha_dialog_background.modal.greyout {
+  background-color:#666;
+  filter: alpha(opacity=70) !IMPORTANT;
+  -moz-opacity: 0.7;
+  opacity: 0.7;
+}
+.xinha_dialog_background.modal {
+  filter: alpha(opacity=0) !IMPORTANT;
+  -moz-opacity: 0;
+  opacity: 0;
+  border:none;
+}
+body.xinha_dialog_background.modal.greyout {
+  filter: alpha(opacity=100) !IMPORTANT;
+}
+body.xinha_dialog_background.modal {
+  filter: alpha(opacity=0);
+}
 .dialog .content { padding: 2px; }
 
@@ -127 +155 @@
 .dialog .title, .dialog h1
 {
-  background: #008;
-  color: #ff8;
+  background: ActiveCaption;
+  color: CaptionText;
   border-bottom: 1px solid #000;
   padding: 1px 0px 2px 5px;
@@ -134 +162 @@
   font-weight: bold;
   cursor: default;
-}
-.dialog h1 { margin:0px;}
+  letter-spacing: 0.01em;
+}
+.dialog h1 { margin:0;}
 .dialog .title .button {
   float: right;
@@ -148 +177 @@
 
 .dialog button {
-  width: 5em;
+  width: 5.5em;
   padding: 0px;
 }
-
+.dialog .closeButton {
+  padding: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  height : 11px;
+  width : 11px;
+  vertical-align : top;
+  position : absolute;
+  top : 3px;
+  right : 2px;
+  background-color: ButtonFace;
+  color: ButtonText;
+  font-size: 13px;
+  font-family: Tahoma,Verdana,sans-serif;
+  text-align:center;
+  letter-spacing:0;
+  overflow:hidden;
+}
 .dialog .buttonColor {
   width :1em;
@@ -179 +226 @@
 .dialog .label { text-align: right; width: 6em; }
 .dialog .value input { width: 100%; }
-.dialog .buttons { text-align: right; padding: 2px 4px 0px 4px; }
 
 .dialog legend { font-weight: bold; }
 .dialog fieldset table { margin: 2px 0px; }
-
+ 
+.dialog  .buttons {
+
+      padding: 1em; 
+      text-align: center;
+}
+.dialog .resizeHandle {
+    -moz-appearance : resizer;
+    width: 12px;
+    height: 12px;
+    border-bottom: 2px solid #000;
+    border-right: 2px solid #000;
+    cursor : nw-resize;
+}
 .popupwin {
   padding: 0px;
@@ -229 +288 @@
 
 .htmlarea .panel h1 {
-  background: ButtonFace;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  margin:   0px;
-  padding:  0px;
-  font-size:100%;
-  font-weight:bold;
-  padding: 2px;
   clear:left;
-  
-}
-
-.htmlarea .panel { overflow:hidden; }
+  font-size:0.9em;
+}
+
+.htmlarea .panel { 
+  overflow:hidden; 
+  background-color:white;
+  padding-bottom:0 !IMPORTANT;
+  border: none !IMPORTANT;
+}
 .htmlarea .panels.left  .panel { border-right:none; border-left:none; }
 .htmlarea .panels.left  h1     { border-right:none;  }

trunk/XinhaCore.js

@@ -977 +977 @@
     "Formatted": "pre"
   };
+  
+  this.dialogOptions =
+  { 
+    'centered' : true, //true: dialog is shown in the center the screen, false dialog is shown near the clicked toolbar button
+    'greyout':true, //true: when showing modal dialogs, the page behind the dialoge is greyed-out
+    'closeOnEscape':true
+  };
+
   /** ??
    * Default: <code>{}</code>
@@ -1782 +1790 @@
         function(ev)
         {
-          ev = Xinha.is_ie ? window.event : ev;
-          editor.btnClickEvent = ev;
+          ev = ev || window.event;
+          editor.btnClickEvent = {clientX : ev.clientX, clientY : ev.clientY};
           if ( obj.enabled )
           {
@@ -2100 +2108 @@
   }
 
-  if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/inline-dialog.js' , this.generate, this ) )
+  if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/XinhaDialog.js' , this.generate, this ) )
   {    
     return false;
@@ -2259 +2267 @@
   fw.table.appendChild(fw.tbody);
 
-  var xinha = this._framework.table;
+  var xinha = fw.table;
   this._htmlArea = xinha;
   Xinha.freeLater(this, '_htmlArea');
@@ -2265 +2273 @@
 
     // create the toolbar and put in the area
-  this._framework.tb_cell.appendChild( this._createToolbar() );
+  fw.tb_cell.appendChild( this._createToolbar() );
 
     // create the IFRAME & add to container
@@ -2271 +2279 @@
   iframe.src = this.popupURL(editor.config.URIs.blank);
   iframe.id = "XinhaIFrame_" + this._textArea.id;
-  this._framework.ed_cell.appendChild(iframe);
+  fw.ed_cell.appendChild(iframe);
   this._iframe = iframe;
   this._iframe.className = 'xinha_iframe';
@@ -2278 +2286 @@
     // creates & appends the status bar
   var statusbar = this._createStatusBar();
-  this._framework.sb_cell.appendChild(statusbar);
+  fw.sb_cell.appendChild(statusbar);
 
   // insert Xinha before the textarea.
@@ -2287 +2295 @@
   // extract the textarea and insert it into the xinha framework
   Xinha.removeFromParent(textarea);
-  this._framework.ed_cell.appendChild(textarea);
+  fw.ed_cell.appendChild(textarea);
 
   // if another editor is activated while this one is in text mode, toolbar is disabled   
@@ -2469 +2477 @@
   this._risizing = true;
   
+  var framework = this._framework;
+  
   this.notifyOf('before_resize', {width:width, height:height});
   this.firePluginEvent('onBeforeResize', width, height);
@@ -2580 +2590 @@
 //  }
 
-  this._framework.tb_cell.colSpan = col_span;
-  this._framework.tp_cell.colSpan = col_span;
-  this._framework.bp_cell.colSpan = col_span;
-  this._framework.sb_cell.colSpan = col_span;
+  framework.tb_cell.colSpan = col_span;
+  framework.tp_cell.colSpan = col_span;
+  framework.bp_cell.colSpan = col_span;
+  framework.sb_cell.colSpan = col_span;
 
   // Put in the panel rows, top panel goes above editor row
-  if ( !this._framework.tp_row.childNodes.length )
-  {
-    Xinha.removeFromParent(this._framework.tp_row);
+  if ( !framework.tp_row.childNodes.length )
+  {
+    Xinha.removeFromParent(framework.tp_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.tp_row) )
-    {
-      this._framework.tbody.insertBefore(this._framework.tp_row, this._framework.ler_row);
+    if ( !Xinha.hasParentNode(framework.tp_row) )
+    {
+      framework.tbody.insertBefore(framework.tp_row, framework.ler_row);
     }
   }
 
   // bp goes after the editor
-  if ( !this._framework.bp_row.childNodes.length )
-  {
-    Xinha.removeFromParent(this._framework.bp_row);
+  if ( !framework.bp_row.childNodes.length )
+  {
+    Xinha.removeFromParent(framework.bp_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.bp_row) )
-    {
-      this._framework.tbody.insertBefore(this._framework.bp_row, this._framework.ler_row.nextSibling);
+    if ( !Xinha.hasParentNode(framework.bp_row) )
+    {
+      framework.tbody.insertBefore(framework.bp_row, framework.ler_row.nextSibling);
     }
   }
@@ -2614 +2624 @@
   if ( !this.config.statusBar )
   {
-    Xinha.removeFromParent(this._framework.sb_row);
+    Xinha.removeFromParent(framework.sb_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.sb_row) )
-    {
-      this._framework.table.appendChild(this._framework.sb_row);
+    if ( !Xinha.hasParentNode(framework.sb_row) )
+    {
+      framework.table.appendChild(framework.sb_row);
     }
   }
 
   // Size and set colspans, link up the framework
-  this._framework.lp_cell.style.width  = this.config.panel_dimensions.left;
-  this._framework.rp_cell.style.width  = this.config.panel_dimensions.right;
-  this._framework.tp_cell.style.height = this.config.panel_dimensions.top;
-  this._framework.bp_cell.style.height = this.config.panel_dimensions.bottom;
-  this._framework.tb_cell.style.height = this._toolBar.offsetHeight + 'px';
-  this._framework.sb_cell.style.height = this._statusBar.offsetHeight + 'px';
+  framework.lp_cell.style.width  = this.config.panel_dimensions.left;
+  framework.rp_cell.style.width  = this.config.panel_dimensions.right;
+  framework.tp_cell.style.height = this.config.panel_dimensions.top;
+  framework.bp_cell.style.height = this.config.panel_dimensions.bottom;
+  framework.tb_cell.style.height = this._toolBar.offsetHeight + 'px';
+  framework.sb_cell.style.height = this._statusBar.offsetHeight + 'px';
 
   var edcellheight = height - this._toolBar.offsetHeight - this._statusBar.offsetHeight;
@@ -3944 +3954 @@
 Xinha.prototype.updateToolbar = function(noStatus)
 {
+  if (this.suspendUpdateToolbar) return;
+  
   var doc = this._doc;
   var text = (this._editMode == "textmode");
@@ -4714 +4726 @@
     }
   }
+
+  /* If this.currentModal is not null, then there's a modal dialog 
+  /* on screen, and we kill the event. This eliminates the possibility
+  /* of a user 'tabbing' out of a modal dialog and re-activating the editor.
+  /* This fixes the bug reported in ticket #1259
+  /* http://xinha.webfactional.com/ticket/1259 */
+  if (this.currentModal)
+  {
+    return false;
+  }
+
   // update the toolbar state after some time
   if ( editor._timerToolbar )
@@ -4719 +4742 @@
     clearTimeout(editor._timerToolbar);
   }
+  if (!this.suspendUpdateToolbar)
+  {
   editor._timerToolbar = setTimeout(
     function()
@@ -4726 +4751 @@
     },
     250);
+  }
 };
 
@@ -5485 +5511 @@
 };
 
+Xinha.getEvent = function(ev)
+{
+  return ev || window.event;
+}
 /**
  * Prepares an element to receive more than one DOM-0 event handler
@@ -6179 +6209 @@
         s += prop + ' = ' + o[prop] + '\n';
       }
-
     }
     if (s) 
@@ -6789 +6818 @@
   scope = (scope) ? scope : window;
   var x,y;
-  if (scope.pageYOffset) // all except Explorer
+  if (typeof scope.pageYOffset != 'undefined') // all except Explorer
   {
     x = scope.pageXOffset;
     y = scope.pageYOffset;
   }
-  else if (scope.document.documentElement && document.documentElement.scrollTop)
+  else if (scope.document.documentElement && typeof document.documentElement.scrollTop != 'undefined')
     // Explorer 6 Strict
   {

trunk/modules/ColorPicker/ColorPicker.js

@@ -372 +372 @@
           this.table.style.position = 'fixed';
         }
-        top+=e.offsetTop - e.scrollTop;
-        left+=e.offsetLeft - e.scrollLeft;
+        top += e.offsetTop - e.scrollTop;
+        left += e.offsetLeft - e.scrollLeft;
 
         e = e.offsetParent;

trunk/modules/CreateLink/link.js

@@ -1 @@
-
   /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
     --  Xinha (is not htmlArea) - http://xinha.org
@@ -16 +15 @@
     --  which provides the functionality to insert a hyperlink in the editor.
     --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
+    --  The file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
     --
     --
@@ -24 +23 @@
     --  $LastChangedBy:ray $
     --------------------------------------------------------------------------*/
+
+function CreateLink(editor) {
+        this.editor = editor;
+        var cfg = editor.config;
+        var self = this;
+
+   editor.config.btnList.createlink[3] = function() { self.show(self._getSelectedAnchor()); }
+}
+
 CreateLink._pluginInfo = {
   name          : "CreateLink",
   origin        : "Xinha Core",
-  version       : "$LastChangedRevision:990 $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  version       : "$LastChangedRevision$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL:http://svn.xinha.webfactional.com/trunk/modules/CreateLink/link.js $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  developer_url : "$HeadURL$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   sponsor       : "",
   sponsor_url   : "",
@@ -35 +43 @@
 };
 
-function CreateLink(editor) {
-}                                                       
+CreateLink.prototype._lc = function(string) {
+        return Xinha._lc(string, 'Xinha');
+};
 
-Xinha.prototype._createLink = function(link)
+
+CreateLink.prototype.onGenerateOnce = function()
 {
-  var editor = this;
-  var outparam = null;
-  if ( typeof link == "undefined" )
-  {
-    link = this.getParentElement();
-    if ( link )
-    {
-      while (link && !/^a$/i.test(link.tagName))
-      {
-        link = link.parentNode;
-      }
-    }
-  }
-  if ( !link )
-  {
-    var sel = editor.getSelection();
-    var range = editor.createRange(sel);
-    var compare = 0;
-    if ( Xinha.is_ie )
-    {
-      if ( sel.type == "Control" )
-      {
-        compare = range.length;
-      }
-      else
-      {
-        compare = range.compareEndPoints("StartToEnd", range);
-      }
-    }
-    else
-    {
-      compare = range.compareBoundaryPoints(range.START_TO_END, range);
-    }
-    if ( compare === 0 )
-    {
-      alert(Xinha._lc("You need to select some text before creating a link"));
-      return;
-    }
-    outparam =
-    {
-      f_href : '',
-      f_title : '',
-      f_target : '',
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  else
-  {
-    outparam =
-    {
-      f_href   : Xinha.is_ie ? editor.stripBaseURL(link.href) : link.getAttribute("href"),
-      f_title  : link.title,
-      f_target : link.target,
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  Dialog(
-    editor.config.URIs.link,
-    function(param)
-    {
-      if ( !param )
-      {
-        return false;
-      }
-      var a = link;
-      if ( !a )
-      {
-        try
-        {
-          var tmp = Xinha.uniq('http://www.example.com/Link');
-          editor._doc.execCommand('createlink', false, tmp);
+  CreateLink.loadAssets();
+};
 
-          // Fix them up
-          var anchors = editor._doc.getElementsByTagName('a');
-          for(var i = 0; i < anchors.length; i++)
-          {
-            var anchor = anchors[i];
-            if(anchor.href == tmp)
-            {
-              // Found one.
-              if (!a) a = anchor;
-              anchor.href =  param.f_href;
-              if (param.f_target) anchor.target =  param.f_target;
-              if (param.f_title)  anchor.title =  param.f_title;
-            }
-          }
-        } catch(ex) {}
-      }
-      else
-      {
-        var href = param.f_href.trim();
-        editor.selectNodeContents(a);
-        if ( href === '' )
-        {
-          editor._doc.execCommand("unlink", false, null);
-          editor.updateToolbar();
-          return false;
-        }
-        else
-        {
-          a.href = href;
-        }
-      }
-      if ( ! ( a && a.tagName.toLowerCase() == 'a' ) )
-      {
-        return false;
-      }
-      a.target = param.f_target.trim();
-      a.title = param.f_title.trim();
-      editor.selectNodeContents(a);
-      editor.updateToolbar();
-    },
-    outparam);
+CreateLink.loadAssets = function()
+{
+        var self = CreateLink;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(_editor_url + 'modules/CreateLink/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
+        Xinha._getback(_editor_url + 'modules/CreateLink/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
+}
+
+CreateLink.prototype.onUpdateToolbar = function()
+{ 
+        if (!(CreateLink.dialogReady && CreateLink.methodsReady))
+        {
+                this.editor._toolbarObjects.createlink.state("enabled", false);
+        }
+        else this.onUpdateToolbar = null;
 };
+
+CreateLink.prototype.prepareDialog = function()
+{
+        var self = this;
+        var editor = this.editor;
+
+        var dialog = this.dialog = new Xinha.Dialog(editor, CreateLink.html, 'Xinha',{width:400})
+        // Connect the OK and Cancel buttons
+        dialog.getElementById('ok').onclick = function() {self.apply();}
+
+        dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+
+        if (!editor.config.makeLinkShowsTarget)
+        {
+                dialog.getElementById("f_target_label").style.visibility = "hidden";
+                dialog.getElementById("f_target").style.visibility = "hidden";
+                dialog.getElementById("f_other_target").style.visibility = "hidden";
+        }
+
+        dialog.getElementById('f_target').onchange= function() 
+        {
+                var f = dialog.getElementById("f_other_target");
+                if (this.value == "_other") {
+                        f.style.visibility = "visible";
+                        f.select();
+                        f.focus();
+                } else f.style.visibility = "hidden";
+        };
+
+        
+        this.dialogReady = true;
+};

trunk/modules/Gecko/Gecko.js

@@ -576 +576 @@
 Xinha.prototype.restoreSelection = function(savedSelection)
 {
+  try 
+  {
   var sel = this.getSelection();
   sel.removeAllRanges();
   sel.addRange(savedSelection);
+  }
+  catch (e) {}
 }
 /**
@@ -585 +589 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.