Changeset 523

Timestamp:

08/15/08 00:05:33 (4 years ago)

Author:

jf.hovinne

Message:

Added logoHtml option. Created helper. Moved replaceAll and trim to helper.

File:

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

trunk/src/wymeditor/jquery.wymeditor.js

@@ -48 +48 @@
     IFRAME_DEFAULT      - The iframe's default base path.
     JQUERY_PATH         - A string replaced by the computed jQuery path.
+    LOGO                - A string replaced by WYMeditor logo.
     TOOLS               - A string replaced by the toolbar's HTML.
     TOOLS_ITEMS         - A string replaced by the toolbar items.
@@ -118 +119 @@
     IFRAME_DEFAULT      : "iframe/default/",
     JQUERY_PATH         : "{Wym_Jquery_Path}",
+    LOGO                : "{Wym_Logo}",
     TOOLS               : "{Wym_Tools}",
     TOOLS_ITEMS         : "{Wym_Tools_Items}",
@@ -341 +343 @@
               + "</div>"
               + "<div class='wym_area_bottom'>"
-              + "<a class='wym_wymeditor_link' "
-              + "href='http://www.wymeditor.org/'>WYMeditor</a>"
+              + WYMeditor.LOGO
               + "</div>"
               + "</div>",
+
+    logoHtml:  "<a class='wym_wymeditor_link' "
+              + "href='http://www.wymeditor.org/'>WYMeditor</a>",
 
     iframeHtml:"<div class='wym_iframe wym_section'>"
@@ -719 +723 @@
       this._box = jQuery(this._element).hide().after(this._options.boxHtml).next();
       
+      var h = WYMeditor.Helper;
+
       //construct the iframe
       var iframeHtml = this._options.iframeHtml;
-      iframeHtml = iframeHtml
-        .replaceAll(WYMeditor.INDEX,this._index)
-        .replaceAll(WYMeditor.IFRAME_BASE_PATH, this._options.iframeBasePath);
+      iframeHtml = h.replaceAll(iframeHtml, WYMeditor.INDEX, this._index);
+      iframeHtml = h.replaceAll(iframeHtml, WYMeditor.IFRAME_BASE_PATH, this._options.iframeBasePath);
       
       //construct wymbox
       var boxHtml = jQuery(this._box).html();
       
-      boxHtml = boxHtml.replaceAll(WYMeditor.TOOLS, this._options.toolsHtml);
-      boxHtml = boxHtml.replaceAll(WYMeditor.CONTAINERS,this._options.containersHtml);
-      boxHtml = boxHtml.replaceAll(WYMeditor.CLASSES, this._options.classesHtml);
-      boxHtml = boxHtml.replaceAll(WYMeditor.HTML, this._options.htmlHtml);
-      boxHtml = boxHtml.replaceAll(WYMeditor.IFRAME, iframeHtml);
-      boxHtml = boxHtml.replaceAll(WYMeditor.STATUS, this._options.statusHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.LOGO, this._options.logoHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.TOOLS, this._options.toolsHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.CONTAINERS,this._options.containersHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.CLASSES, this._options.classesHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.HTML, this._options.htmlHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.IFRAME, iframeHtml);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.STATUS, this._options.statusHtml);
       
       //construct tools list
@@ -742 +748 @@
         var oTool = aTools[i];
         if(oTool.name && oTool.title)
-          sTools += this._options.toolsItemHtml
-          .replaceAll(WYMeditor.TOOL_NAME, oTool.name)
-          .replaceAll(WYMeditor.TOOL_TITLE,
-              this._options.stringDelimiterLeft
+          var sTool = this._options.toolsItemHtml;
+          var sTool = h.replaceAll(sTool, WYMeditor.TOOL_NAME, oTool.name);
+          sTool = h.replaceAll(sTool, WYMeditor.TOOL_TITLE, this._options.stringDelimiterLeft
             + oTool.title
-            + this._options.stringDelimiterRight)
-          .replaceAll(WYMeditor.TOOL_CLASS, oTool.css);
+            + this._options.stringDelimiterRight);
+          sTool = h.replaceAll(sTool, WYMeditor.TOOL_CLASS, oTool.css);
+          sTools += sTool;
       }
 
-      boxHtml = boxHtml.replaceAll(WYMeditor.TOOLS_ITEMS, sTools);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.TOOLS_ITEMS, sTools);
 
       //construct classes list
@@ -760 +766 @@
         var oClass = aClasses[i];
         if(oClass.name && oClass.title)
-          sClasses += this._options.classesItemHtml
-          .replaceAll(WYMeditor.CLASS_NAME, oClass.name)
-          .replaceAll(WYMeditor.CLASS_TITLE, oClass.title);
+          var sClass = this._options.classesItemHtml;
+          sClass = h.replaceAll(sClass, WYMeditor.CLASS_NAME, oClass.name);
+          sClass = h.replaceAll(sClass, WYMeditor.CLASS_TITLE, oClass.title);
+          sClasses += sClass;
       }
 
-      boxHtml = boxHtml.replaceAll(WYMeditor.CLASSES_ITEMS, sClasses);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.CLASSES_ITEMS, sClasses);
       
       //construct containers list
@@ -774 +781 @@
         var oContainer = aContainers[i];
         if(oContainer.name && oContainer.title)
-          sContainers += this._options.containersItemHtml
-          .replaceAll(WYMeditor.CONTAINER_NAME, oContainer.name)
-          .replaceAll(WYMeditor.CONTAINER_TITLE,
+          var sContainer = this._options.containersItemHtml;
+          sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_NAME, oContainer.name);
+          sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_TITLE,
               this._options.stringDelimiterLeft
             + oContainer.title
-            + this._options.stringDelimiterRight)
-          .replaceAll(WYMeditor.CONTAINER_CLASS, oContainer.css);
+            + this._options.stringDelimiterRight);
+          sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_CLASS, oContainer.css);
+          sContainers += sContainer;
       }
 
-      boxHtml = boxHtml.replaceAll(WYMeditor.CONTAINERS_ITEMS, sContainers);
+      boxHtml = h.replaceAll(boxHtml, WYMeditor.CONTAINERS_ITEMS, sContainers);
 
       //l10n
@@ -1079 +1087 @@
   //replace all the strings in sVal and return it
   for (var key in WYMeditor.STRINGS[this._options.lang]) {
-    sVal = sVal.replaceAll(this._options.stringDelimiterLeft + key 
+    sVal = WYMeditor.Helper.replaceAll(sVal, this._options.stringDelimiterLeft + key 
     + this._options.stringDelimiterRight,
     WYMeditor.STRINGS[this._options.lang][key]);
@@ -1145 +1153 @@
     }
     
+    var h = WYMeditor.Helper;
+
     //construct the dialog
     var dialogHtml = this._options.dialogHtml;
-    dialogHtml = dialogHtml
-      .replaceAll(WYMeditor.BASE_PATH, this._options.basePath)
-      .replaceAll(WYMeditor.CSS_PATH, this._options.skinPath
-        + WYMeditor.SKINS_DEFAULT_CSS)
-      .replaceAll(WYMeditor.WYM_PATH, this._options.wymPath)
-      .replaceAll(WYMeditor.JQUERY_PATH, this._options.jQueryPath)
-      .replaceAll(WYMeditor.DIALOG_TITLE, this.encloseString(sType))
-      .replaceAll(WYMeditor.DIALOG_BODY, sBodyHtml)
-      .replaceAll(WYMeditor.INDEX, this._index);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.BASE_PATH, this._options.basePath);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.CSS_PATH, this._options.skinPath + WYMeditor.SKINS_DEFAULT_CSS);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.WYM_PATH, this._options.wymPath);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.JQUERY_PATH, this._options.jQueryPath);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.DIALOG_TITLE, this.encloseString(sType));
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.DIALOG_BODY, sBodyHtml);
+    dialogHtml = h.replaceAll(dialogHtml, WYMeditor.INDEX, this._index);
       
     dialogHtml = this.replaceStrings(dialogHtml);
@@ -3715 +3723 @@
     if(!this._in_style){
       this._has_title = true;
-      this._current_item = {'title':text.trim()};
+      this._current_item = {'title':WYMeditor.Helper.trim(text)};
     }else{
       if(this._current_item[this._current_element]){
@@ -3733 +3741 @@
 {
   if(status == WYMeditor.LEXER_UNMATCHED){
-    match = match.trim();
+    match = WYMeditor.Helper.trim(match);
     if(match != ''){
       this._current_item[this._current_element].style = match;
@@ -3791 +3799 @@
 
       this.css_settings.classesItems.push({
-        'name': details.name.trim(),
+        'name': WYMeditor.Helper.trim(details.name),
         'title': style_details.title,
-        'expr' : (details.expressions||details.tags).join(', ').trim()
+        'expr' : WYMeditor.Helper.trim((details.expressions||details.tags).join(', '))
       });
       if(details.feedback_style){
         this.css_settings.editorStyles.push({
-          'name': '.'+details.name.trim(),
+          'name': '.'+ WYMeditor.Helper.trim(details.name),
           'css': details.feedback_style
         });
@@ -3803 +3811 @@
       if(details.style){
         this.css_settings.dialogStyles.push({
-          'name': '.'+details.name.trim(),
+          'name': '.'+ WYMeditor.Helper.trim(details.name),
           'css': details.style
         });
@@ -3854 +3862 @@
 };
 
-if(!String.prototype.replaceAll) {
-    String.prototype.replaceAll = function(old, rep) {
+WYMeditor.Helper = {
+
+    replaceAll: function(str, old, rep) {
         var rExp = new RegExp(old, "g");
-        return(this.replace(rExp, rep));
-    };
-};
-
-if(!String.prototype.trim) {
-    String.prototype.trim = function() {
-        return this.replace(/^(\s*)|(\s*)$/gm,'');
-    };
+        return(str.replace(rExp, rep));
+    },
+
+    trim: function(str) {
+        return str.replace(/^(\s*)|(\s*)$/gm,'');
+    }
 };