Changeset 410

Timestamp:

08/22/07 13:02:48 (5 years ago)

Author:

jf.hovinne

Message:

Added dialogTypeSelector, updated dialogs body (added wym_dialog_type). Fix selection to populate link or image dialog fields (tested on MSIE and FF).

File:

• trunk/src/wymeditor/jquery.wymeditor.js (modified) (6 diffs)

trunk/src/wymeditor/jquery.wymeditor.js

@@ -317 +317 @@
     previewSelector:   "",
     
+    dialogTypeSelector:    ".wym_dialog_type",
     dialogLinkSelector:    ".wym_dialog_link",
     dialogImageSelector:   ".wym_dialog_image",
@@ -356 +357 @@
                + "<form>"
                + "<fieldset>"
+               + "<input type='hidden' class='wym_dialog_type' value='"
+               + WYM_DIALOG_LINK
+               + "' />"
                + "<legend>{Link}</legend>"
                + "<div class='row'>"
@@ -380 +384 @@
                + "<form>"
                + "<fieldset>"
+               + "<input type='hidden' class='wym_dialog_type' value='"
+               + WYM_DIALOG_IMAGE
+               + "' />"
                + "<legend>{Image}</legend>"
                + "<div class='row'>"
@@ -408 +415 @@
                + "<form>"
                + "<fieldset>"
+               + "<input type='hidden' class='wym_dialog_type' value='"
+               + WYM_DIALOG_TABLE
+               + "' />"
                + "<legend>{Table}</legend>"
                + "<div class='row'>"
@@ -435 +445 @@
                + ">"
                + "<form>"
+               + "<input type='hidden' class='wym_dialog_type' value='"
+               + WYM_DIALOG_PASTE
+               + "' />"
                + "<fieldset>"
                + "<legend>{Paste_From_Word}</legend>"
@@ -1180 +1193 @@
     var doc = window.document;
     var selected = wym.selected();
+    var dialogType = jQuery(wym._options.dialogTypeSelector).val();
     var sStamp = wym.uniqueStamp();
     
-    //fix MSIE selection if link image has been clicked
-    if(!selected && wym._selected_image) {
-      selected = jQuery(wym._selected_image).parentsOrSelf(WYM_A);
+    switch(dialogType) {
+    
+    case WYM_DIALOG_LINK:
+      //ensure that we select the link to populate the fields
+      if(selected && selected.tagName && selected.tagName.toLowerCase != WYM_A)
+        selected = jQuery(selected).parentsOrSelf(WYM_A);
+    
+      //fix MSIE selection if link image has been clicked
+      if(!selected && wym._selected_image)
+        selected = jQuery(wym._selected_image).parentsOrSelf(WYM_A);
+    break;
+
     }