Changeset 2566:9bf417837888 for admin/js/jsToolBar

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

Location:

admin/js/jsToolBar

Files:

• jsToolBar.dotclear.js (modified) (23 diffs)
• jsToolBar.js (modified) (24 diffs)
• jsToolBar.wysiwyg.js (modified) (33 diffs)
• popup_link.js (modified) (1 diff)
• popup_media.js (modified) (8 diffs)
• popup_posts.js (modified) (1 diff)

admin/js/jsToolBar/jsToolBar.dotclear.js

@@ -8 +8 @@
      window.the_toolbar = this;
      args = args || '';
-     
+
      this.elements.link.data = {};
      var url = this.elements.link.open_url+args;
-     
+
      var p_win = window.open(url,'dc_popup',
      'alwaysRaised=yes,dependent=yes,toolbar=yes,height=420,width=520,'+
@@ -22 +22 @@
 jsToolBar.prototype.elements.link.fncall.wiki = function() {
      var data = this.elements.link.data;
-     
+
      if (data.href == '') { return; }
-     
+
      var etag = '|'+data.href;
      if (data.hreflang) { etag += '|'+data.hreflang; }
-     
+
      if (data.title) {
           if (!data.hreflang) { etag += '|'; }
           etag += '|'+data.title;
      }
-     
+
      if (data.content) {
           this.encloseSelection('['+data.content,etag+']');
@@ -45 +45 @@
 jsToolBar.prototype.elements.link.fncall.xhtml = function() {
      var data = this.elements.link.data;
-     
+
      if (data.href == '') { return; }
-     
+
      var stag = '<a href="'+data.href+'"';
-     
+
      if (data.hreflang) { stag += ' hreflang="'+data.hreflang+'"'; }
      if (data.title) { stag += ' title="'+data.title+'"'; }
      stag += '>';
      var etag = '</a>';
-     
+
      if (data.content) {
           this.encloseSelection('','',function() {
@@ -68 +68 @@
      href = title = hreflang = '';
      hreflang = this.elements.link.default_hreflang;
-     
+
      var a = this.getAncestor();
-     
+
      if (a.tagName == 'a') {
           href= a.tag.href || '';
@@ -76 +76 @@
           hreflang = a.tag.hreflang || '';
      }
-     
+
      this.elements.link.popup.call(this,'?href='+href+'&hreflang='+hreflang+'&title='+title);
 };
 jsToolBar.prototype.elements.link.fncall.wysiwyg = function() {
      var data = this.elements.link.data;
-     
+
      var a = this.getAncestor();
-     
+
      if (a.tagName == 'a') {
           if (data.href == '') {
@@ -106 +106 @@
           }
      }
-     
+
      // Create link
      if (data.content) {
@@ -123 +123 @@
      var res = {};
      var range, commonAncestorContainer;
-     
+
      if (this.iwin.getSelection) { //gecko
           var selection = this.iwin.getSelection();
@@ -135 +135 @@
           commonAncestorContainer = range.parentElement();
      }
-     
+
      var ancestorTagName = commonAncestorContainer.tagName.toLowerCase();
      while (ancestorTagName!='a' && ancestorTagName!='body') {
@@ -141 +141 @@
           ancestorTagName = commonAncestorContainer.tagName.toLowerCase();
      }
-     
+
      res.tag = commonAncestorContainer;
      res.tagName = ancestorTagName;
-     
+
      return res;
 };
@@ -160 +160 @@
           window.the_toolbar = this;
           this.elements.img_select.data = {};
-          
+
           var p_win = window.open(this.elements.img_select.open_url,'dc_popup',
           'alwaysRaised=yes,dependent=yes,toolbar=yes,height=500,width=760,'+
@@ -172 +172 @@
      var d = this.elements.img_select.data;
      if (d.src == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           var alt = (str) ? str : d.title;
           var res = '(('+d.src+'|'+alt;
-          
+
           if (d.alignment == 'left') {
                res += '|L';
@@ -186 +186 @@
                res += '|';
           }
-          
+
           if (d.description) {
                res += '|'+d.description;
           }
-          
+
           res += '))';
-          
+
           if (d.link) {
                var ltitle = (alt) ? '||'+alt : '';
                res = '['+res+'|'+d.url+ltitle+']';
           }
-          
+
           return res;
      });
@@ -207 +207 @@
      var d = this.elements.img_select.data;
      if (d.src == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           var alt = (str) ? str : d.title;
           var res = '<img src="'+d.src+'" alt="'+alt.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"';
-          
+
           if (d.alignment == 'left') {
                res += ' style="float: left; margin: 0 1em 1em 0;"';
@@ -219 +219 @@
                res += ' style="margin: 0 auto; display: block;"';
           }
-          
+
           if (d.description) {
                res += ' title="'+d.description.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"';
           }
-          
+
           res += ' />';
-          
+
           if (d.link) {
                var ltitle = (alt) ? ' title="'+alt.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"' : '';
                res = '<a href="'+d.url+'"'+ltitle+'>'+res+'</a>';
           }
-          
+
           return res;
      });
@@ -238 +238 @@
      var src = this.elements.img.prompt.call(this);
      if (!src) { return; }
-     
+
      var img = this.iwin.document.createElement('img');
      img.src = src;
      img.setAttribute('alt',this.getSelectedText());
-     
+
      this.insertNode(img);
 };
@@ -253 +253 @@
      var alt = (this.getSelectedText()) ? this.getSelectedText() : d.title;
      if (d.src == undefined) { return; }
-     
+
      var img = this.iwin.document.createElement('img');
      img.src = d.src;
      img.setAttribute('alt',alt);
-     
-     
+
+
      if (d.alignment == 'left') {
           if (img.style.styleFloat != undefined) {
@@ -286 +286 @@
           img.style.display = 'block';
      }
-     
+
      if (d.description) {
           img.setAttribute('title',d.description);
      }
-     
+
      if (d.link) {
           var a = this.iwin.document.createElement('a');
@@ -309 +309 @@
      var d = this.elements.mp3_insert.data;
      if (d.player == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           return '\n///html\n' + d.player + '///\n';
@@ -317 +317 @@
      var d = this.elements.mp3_insert.data;
      if (d.player == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           return '\n' + d.player + '\n';
@@ -331 +331 @@
      var d = this.elements.flv_insert.data;
      if (d.player == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           return '\n///html\n' + d.player + '///\n';
@@ -339 +339 @@
      var d = this.elements.flv_insert.data;
      if (d.player == undefined) { return; }
-     
+
      this.encloseSelection('','',function(str) {
           return '\n' + d.player + '\n';
@@ -360 +360 @@
           window.the_toolbar = this;
           this.elements.img_select.data = {};
-          
+
           var p_win = window.open(this.elements.post_link.open_url,'dc_popup',
           'alwaysRaised=yes,dependent=yes,toolbar=yes,height=500,width=760,'+
@@ -378 +378 @@
 // Last space element
 jsToolBar.prototype.elements.space3 = {
-     type:'space', 
+     type:'space',
      format:{
           wysiwyg:true,

admin/js/jsToolBar/jsToolBar.js

@@ -8 +8 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * DotClear is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with DotClear; if not, write to the Free Software
@@ -23 +23 @@
 function jsToolBar(textarea) {
      if (!document.createElement) { return; }
-     
+
      if (!textarea) { return; }
-     
+
      if ((typeof(document["selection"]) == "undefined")
      && (typeof(textarea["setSelectionRange"]) == "undefined")) {
           return;
      }
-     
+
      this.textarea = textarea;
-     
+
      this.editor = document.createElement('div');
      this.editor.className = 'jstEditor';
-     
+
      this.textarea.parentNode.insertBefore(this.editor,this.textarea);
      this.editor.appendChild(this.textarea);
-     
+
      this.toolbar = document.createElement("div");
      this.toolbar.className = 'jstElements';
      this.editor.parentNode.insertBefore(this.toolbar,this.editor);
-     
+
      // Dragable resizing (only for gecko)
      if (navigator.appName == 'Microsoft Internet Explorer')
      {
           if (this.editor.addEventListener)
-          {         
+          {
                this.handle = document.createElement('div');
                this.handle.className = 'jstHandle';
@@ -56 +56 @@
           }
      }
-     
+
      this.context = null;
-     this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni 
+     this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni
                          // de raccourcis vers les éléments DOM correspondants aux outils.
 };
@@ -70 +70 @@
 jsButton.prototype.draw = function() {
      if (!this.scope) return null;
-     
+
      var button = document.createElement('button');
      button.setAttribute('type','button');
@@ -78 +78 @@
      span.appendChild(document.createTextNode(this.title));
      button.appendChild(span);
-     
+
      if (this.icon != undefined) {
           button.style.backgroundImage = 'url('+this.icon+')';
@@ -99 +99 @@
      span.className = 'jstSpacer';
      if (this.width) span.style.marginRight = this.width+'px';
-     
+
      return span;
 };
@@ -112 +112 @@
 jsCombo.prototype.draw = function() {
      if (!this.scope || !this.options) return null;
-     
+
      var select = document.createElement('select');
      if (this.className) select.className = className;
      select.title = this.title;
-     
+
      for (var o in this.options) {
           //var opt = this.options[o];
@@ -124 +124 @@
           select.appendChild(option);
      }
-     
+
      var This = this;
      select.onchange = function() {
-          try { 
+          try {
                This.fn.call(This.scope, this.value);
           } catch (e) { alert(e); }
-          
+
           return false;
      };
-     
+
      return select;
 };
@@ -142 +142 @@
      mode: 'xhtml',
      elements: {},
-     
+
      getMode: function() {
           return this.mode;
      },
-     
+
      setMode: function(mode) {
           this.mode = mode || 'xhtml';
      },
-     
+
      switchMode: function(mode) {
           mode = mode || 'xhtml';
           this.draw(mode);
      },
-     
+
      button: function(toolName) {
           var tool = this.elements[toolName];
@@ -175 +175 @@
      combo: function(toolName) {
           var tool = this.elements[toolName];
-          
+
           if( tool[this.mode] != undefined) {
-               
+
                var length = tool[this.mode].list.length;
-               
+
                if (typeof tool[this.mode].fn != 'function' || length == 0) {
                     return null;
@@ -190 +190 @@
                     return new jsCombo(tool.title, options, this, tool[this.mode].fn);
                }
-               
-          }
-          
+
+          }
+
      },
      draw: function(mode) {
           this.setMode(mode);
-          
+
           // Empty toolbar
           while (this.toolbar.hasChildNodes()) {
@@ -202 +202 @@
           }
           this.toolNodes = {}; // vide les raccourcis DOM/**/
-          
+
           // Draw toolbar elements
           var b, tool, newTool;
-          
+
           for (var i in this.elements) {
                b = this.elements[i];
-               
+
                var disabled =
                b.type == undefined || b.type == ''
                || (b.disabled != undefined && b.disabled)
                || (b.context != undefined && b.context != null && b.context != this.context);
-               
+
                if (!disabled && typeof this[b.type] == 'function') {
                     tool = this[b.type](i);
@@ -224 +224 @@
           }
      },
-     
+
      singleTag: function(stag,etag) {
           stag = stag || null;
           etag = etag || stag;
-          
+
           if (!stag || !etag) { return; }
-          
+
           this.encloseSelection(stag,etag);
      },
-     
+
      encloseSelection: function(prefix, suffix, fn) {
           this.textarea.focus();
-          
+
           prefix = prefix || '';
           suffix = suffix || '';
-          
+
           var start, end, sel, scrollPos, subst, res;
-          
+
           if (typeof(document["selection"]) != "undefined") {
                sel = document.selection.createRange().text;
@@ -250 +250 @@
                sel = this.textarea.value.substring(start, end);
           }
-          
+
           if (sel.match(/ $/)) { // exclude ending space char, if any
                sel = sel.substring(0, sel.length - 1);
                suffix = suffix + " ";
           }
-          
+
           if (typeof(fn) == 'function') {
                res = (sel) ? fn.call(this,sel) : fn('');
@@ -261 +261 @@
                res = (sel) ? sel : '';
           }
-          
+
           subst = prefix + res + suffix;
-          
+
           if (typeof(document["selection"]) != "undefined") {
                var range = document.selection.createRange().text = subst;
@@ -278 +278 @@
           }
      },
-     
+
      stripBaseURL: function(url) {
           if (this.base_url != '') {
@@ -286 +286 @@
                }
           }
-          
+
           return url;
      }
@@ -355 +355 @@
 // spacer
 jsToolBar.prototype.elements.space0 = {
-     type:'space', 
+     type:'space',
      format:{
           wysiwyg:true,
@@ -425 +425 @@
 // spacer
 jsToolBar.prototype.elements.space1 = {
-     type:'space', 
+     type:'space',
      format:{
           wysiwyg:true,
@@ -445 +445 @@
 // spacer
 jsToolBar.prototype.elements.space2 = {
-     type:'space', 
+     type:'space',
      format:{
           wysiwyg:true,
@@ -523 +523 @@
 // spacer
 jsToolBar.prototype.elements.space3 = {
-     type:'space', 
+     type:'space',
      format:{
           wysiwyg:true,
@@ -542 +542 @@
           href = href || '';
           hreflang = hreflang || this.elements.link.default_hreflang;
-          
+
           href = window.prompt(this.elements.link.href_prompt,href);
           if (!href) { return false; }
-          
+
           hreflang = window.prompt(this.elements.link.hreflang_prompt,
           hreflang);
-          
+
           return { href: this.stripBaseURL(href), hreflang: hreflang };
      }
@@ -560 +560 @@
           stag = stag+'>';
           var etag = '</a>';
-          
+
           this.encloseSelection(stag,etag);
      }
@@ -571 +571 @@
           if (link.hreflang) { etag = etag+'|'+link.hreflang; }
           etag = etag+']';
-          
+
           this.encloseSelection(stag,etag);
      }

admin/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -8 +8 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * DotClear is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with DotClear; if not, write to the Free Software
@@ -32 +32 @@
 jsToolBar.prototype.draw = function(mode) {
      mode = mode || 'xhtml';
-     
+
      if (this.can_wwg) {
           this.mode = 'wysiwyg';
@@ -44 +44 @@
 jsToolBar.prototype.switchMode = function(mode) {
      mode = mode || 'xhtml';
-     
+
      if (mode == 'xhtml') {
           this.wwg_mode = true;
@@ -70 +70 @@
           this.textarea.value = html;
      }
-     
+
      function initContent() {
           if (!This.iframe.contentWindow.document || !This.iframe.contentWindow.document.body) {
@@ -77 +77 @@
           }
           This.ibody = This.iframe.contentWindow.document.body;
-          
+
           if (This.textarea.value != '' && This.textarea.value != '<p></p>') {
                This.ibody.innerHTML = This.applyWysiwygFilters(This.textarea.value);
@@ -139 +139 @@
 jsToolBar.prototype.initWindow = function() {
      var This = this;
-     
+
      this.iframe = document.createElement('iframe');
      this.textarea.parentNode.insertBefore(this.iframe,this.textarea.nextSibling);
-     
+
      this.switcher = document.createElement('ul');
      this.switcher.className = 'jstSwitcher';
      this.editor.appendChild(this.switcher);
-     
+
      this.iframe.height = this.textarea.offsetHeight + 0;
      this.iframe.width = this.textarea.offsetWidth + 0;
-     
+
      if (this.textarea.tabIndex != undefined) {
           this.iframe.tabIndex = this.textarea.tabIndex;
      }
-     
+
      function initIframe() {
           var doc = This.iframe.contentWindow.document;
@@ -160 +160 @@
                return false;
           }
-          
+
           doc.open();
           var html =
@@ -171 +171 @@
           '</body>\n'+
           '</html>';
-          
+
           doc.write(html);
           doc.close();
@@ -178 +178 @@
                // warning : doc is now inaccessible for IE6 sp1
           }
-          
+
           This.iwin = This.iframe.contentWindow;
-          
+
           This.syncContents('textarea');
-          
+
           if (This.wwg_mode == undefined) {
                This.wwg_mode = true;
           }
-          
+
           if (This.wwg_mode) {
                This.textarea.style.display = 'none';
@@ -192 +192 @@
                This.iframe.style.display = 'none';
           }
-          
+
           // update textarea on submit
           if (This.textarea.form) {
@@ -201 +201 @@
                });
           }
-          
+
           for (var evt in This.iwinEvents) {
                var event = This.iwinEvents[evt];
                This.addIwinEvent(This.iframe.contentWindow.document, event.type, event.fn, This);
           }
-          
+
           This.setSwitcher();
           try { This.iwin.document.designMode = 'on'; } catch (e) {}; // Firefox needs this
-          
+
           return true;
      }
@@ -241 +241 @@
           this.switcher.removeChild(this.switcher.firstChild);
      }
-     
+
      var This = this;
      function setLink(title,link) {
@@ -255 +255 @@
                a = document.createTextNode(title);
           }
-          
+
           li.appendChild(a);
           This.switcher.appendChild(li);
      }
-     
+
      setLink(this.switcher_visual_title,!this.wwg_mode);
      setLink(this.switcher_source_title,this.wwg_mode);
@@ -271 +271 @@
           this.iframe = null;
      }
-     
+
      if (this.switcher != undefined && this.switcher.parentNode != undefined) {
           this.switcher.parentNode.removeChild(this.switcher);
@@ -312 +312 @@
 jsToolBar.prototype.insertNode = function(node) {
      var range;
-     
+
      if (this.iwin.getSelection) { // Gecko
           var sel = this.iwin.getSelection();
           range = sel.getRangeAt(0);
-          
+
           // deselect all ranges
           sel.removeAllRanges();
-          
+
           // empty range
           range.deleteContents();
-          
+
           // Insert node
           range.insertNode(node);
-          
+
           range.selectNodeContents(node);
           range.setEndAfter(node);
@@ -335 +335 @@
           }
           sel.addRange(range);
-          
+
           sel.collapseToEnd();
      } else { // IE
@@ -391 +391 @@
 jsToolBar.prototype.getBlockLevel = function() {
      var blockElts = ['p','h1','h2','h3','h4','h5','h6'];
-     
+
      var range, commonAncestorContainer;
      if (this.iwin.getSelection) { //gecko
@@ -404 +404 @@
           commonAncestorContainer = range.parentElement();
      }
-     
+
      var ancestorTagName = commonAncestorContainer.tagName.toLowerCase();
      while (arrayIndexOf(blockElts, ancestorTagName)==-1 && ancestorTagName!='body') {
@@ -430 +430 @@
      [/<style[\w\W]*?>[\w\W]*?<\/style>/gim, ''],
      [/<\/?font[\w\W]*?>/gim, ''],
-     
-     
+
+
      /* Replacements */
      [/<(\/?)(B|b|STRONG)([\s>\/])/g, "<$1strong$3"],
@@ -498 +498 @@
           html = html.replace(/(<[^\/!]>|<[^\/!][^>]*[^\/]>)\s*<\/[^>]*[^-]>/g, "");
      }
-     
+
      /* tous les tags en minuscule */
      html = html.replace(/<(\/?)([A-Z0-9]+)/g,
@@ -504 +504 @@
                     return "<" + match1 + match2.toLowerCase();
                });
-     
+
      /* IE laisse souvent des attributs sans guillemets */
      var myRegexp = /<[^>]+((\s+\w+\s*=\s*)([^"'][\w~@+$,%\/:.#?=&;!*()-]*))[^>]*?>/;
@@ -516 +516 @@
           )
      }
-     
+
      /* les navigateurs rajoutent une unite aux longueurs css nulles */
      /* note: a ameliorer ! */
@@ -522 +522 @@
           html = html.replace(/(<[^>]+style=(["'])[^>]+[\s:]+)0(pt|px)(\2|\s|;)/gi, "$1"+"0$4");
      }
-     
+
      /* correction des fins de lignes : le textarea edite contient des \n
      * le wysiwyg des \r\n , et le textarea mis a jour SANS etre affiche des \r\n ! */
      html = html.replace(/\r\n/g,"\n");
-     
+
      /* Trim */
      html = html.replace(/^\s+/gm,'');
      html = html.replace(/\s+$/gm,'');
-     
+
      return html;
 };
@@ -538 +538 @@
      var BQs = this.iwin.document.getElementsByTagName('blockquote');
      var bqChilds;
-     
+
      for (var bq = 0; bq < BQs.length; bq++) {
           bqChilds = BQs[bq].childNodes;
@@ -572 +572 @@
      [/(<[a-z][^>]*)margin-right\s*:[^;]*;/mg, "$1"],
      [/(<[a-z][^>]*)margin-top\s*:[^;]*;/mg, "$1"],
-     
+
      [/(<[a-z][^>]*)padding\s*:[^;]*;/mg, "$1"],
      [/(<[a-z][^>]*)padding-bottom\s*:[^;]*;/mg, "$1"],
@@ -578 +578 @@
      [/(<[a-z][^>]*)padding-right\s*:[^;]*;/mg, "$1"],
      [/(<[a-z][^>]*)padding-top\s*:[^;]*;/mg, "$1"],
-     
+
      [/(<[a-z][^>]*)font\s*:[^;]*;/mg, "$1"],
      [/(<[a-z][^>]*)font-family\s*:[^;]*;/mg, "$1"],
@@ -585 +585 @@
      [/(<[a-z][^>]*)font-variant\s*:[^;]*;/mg, "$1"],
      [/(<[a-z][^>]*)font-weight\s*:[^;]*;/mg, "$1"],
-     
+
      [/(<[a-z][^>]*)color\s*:[^;]*;/mg, "$1"]
 );
@@ -593 +593 @@
           html = html.replace(this.removeFormatRegexp[reg][0], this.removeFormatRegexp[reg][1]);
      }
-     
+
      html = this.tagsoup2xhtml(html);
      html = html.replace(/style="\s*?"/mgi,'');
@@ -693 +693 @@
           commonAncestorContainer = range.parentElement();
      }
-     
+
      var ancestorTagName = commonAncestorContainer.tagName.toLowerCase();
      while (ancestorTagName!='a' && ancestorTagName!='body') {
@@ -699 +699 @@
           ancestorTagName = commonAncestorContainer.tagName.toLowerCase();
      }
-     
+
      // Update or remove link?
      if (ancestorTagName == 'a') {
@@ -705 +705 @@
           hreflang = commonAncestorContainer.hreflang || '';
      }
-     
+
      href = window.prompt(this.elements.link.href_prompt,href);
-     
+
      // Remove link
      if (ancestorTagName == 'a' && href=='') {
@@ -713 +713 @@
      }
      if (!href) return; // user cancel
-     
+
      hreflang = window.prompt(this.elements.link.hreflang_prompt, hreflang);
-     
+
      // Update link
      if (ancestorTagName == 'a' && href) {
@@ -726 +726 @@
           return;
      }
-     
+
      // Create link
      var n = this.getSelectedNode();

admin/js/jsToolBar/popup_link.js

@@ -3 +3 @@
           window.close();
      });
-     
+
      $('#link-insert-ok').click(function() {
           sendClose();
           window.close();
      });
-     
+
      function sendClose() {
           var insert_form = $('#link-insert-form').get(0);
           if (insert_form == undefined) { return; }
-          
+
           var tb = window.opener.the_toolbar;
           var data = tb.elements.link.data;
-          
+
           data.href = tb.stripBaseURL(insert_form.elements.href.value);
           data.title = insert_form.elements.title.value;

admin/js/jsToolBar/popup_media.js

@@ -1 +1 @@
 $(function() {
      var toolBar = window.opener.the_toolbar.textarea;
-     
+
      $('#media-insert').onetabload(function() {
           $('#media-insert-cancel').click(function() {
                window.close();
           });
-          
+
           $('#media-insert-ok').click(function() {
                sendClose();
@@ -12 +12 @@
           });
      });
-     
+
      function sendClose() {
           var insert_form = $('#media-insert-form').get(0);
           if (insert_form == undefined) { return; }
-          
+
           var tb = window.opener.the_toolbar;
           var type = insert_form.elements.type.value;
-          
+
           var media_align_grid = {
                left: 'float: left; margin: 0 1em 1em 0;',
@@ -25 +25 @@
                center: 'text-align: center;'
           };
-          
+
           if (type == 'image')
           {
@@ -31 +31 @@
                tb.elements.img_select.data.alignment = $('input[name="alignment"]:checked',insert_form).val();
                tb.elements.img_select.data.link = $('input[name="insertion"]:checked',insert_form).val() == 'link';
-               
+
                tb.elements.img_select.data.title = insert_form.elements.title.value;
                tb.elements.img_select.data.description = $('input[name="description"]',insert_form).val();
@@ -41 +41 @@
                var player = $('#public_player').val();
                var align = $('input[name="alignment"]:checked',insert_form).val();
-               
+
                if (align != undefined && align != 'none') {
                     player = '<div style="' + media_align_grid[align] + '">' + player + '</div>';
                }
-               
+
                tb.elements.mp3_insert.data.player = player.replace(/>/g,'>\n');
                tb.elements.mp3_insert.fncall[tb.mode].call(tb);
@@ -53 +53 @@
                var oplayer = $('<div>'+$('#public_player').val()+'</div>');
                var flashvars = $("[name=FlashVars]",oplayer).val();
-               
+
                var align = $('input[name="alignment"]:checked',insert_form).val();
                var title = insert_form.elements.title.value;
-               
+
                if (title) {
                     flashvars = 'title='+encodeURI(title)+'&amp;'+flashvars;
@@ -64 +64 @@
                flashvars = flashvars.replace(/(width=\d*)/,'width='+$('#video_w').val());
                flashvars = flashvars.replace(/(height=\d*)/,'height='+$('#video_h').val());
-               
+
                $("[name=FlashVars]",oplayer).val(flashvars);
-               var player = oplayer.html();  
-               
+               var player = oplayer.html();
+
                if (align != undefined && align != 'none') {
                     player = '<div style="' + media_align_grid[align] + '">' + player + '</div>';
                }
-               
+
                tb.elements.flv_insert.data.player = player.replace(/>/g,'>\n');
                tb.elements.flv_insert.fncall[tb.mode].call(tb);
@@ -82 +82 @@
           }
      };
-     
+
      function playerFormat(s) {
           s = s.replace(/&lt;/g,'<');
           s = s.replace(/&gt;/g,'>\n');
           s = s.replace(/&amp;/g,'&');
-          
+
           return s;
      };

admin/js/jsToolBar/popup_posts.js

@@ -3 +3 @@
           window.close();
      });
-     
+
      $('#form-entries tr>td.maximal>a').click(function() {
           // Get post_id
           var tb = window.opener.the_toolbar;
           var data = tb.elements.link.data;
-          
+
           data.href = tb.stripBaseURL($(this).attr('title'));
-          
+
           tb.elements.link.fncall[tb.mode].call(tb);
           window.close();