From b58719caa0f572f09019c5a349ae42126cc637eb Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 19 Jan 2007 13:07:48 +0000 Subject: WP Merge to rev 4771 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@852 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/js/crop/cropper.js | 34 ++++++++++++++++----------------- wp-includes/js/dbx.compressed.js | 1 - wp-includes/js/fat.compressed.js | 1 - wp-includes/js/list-manipulation-js.php | 28 +++++++++++++-------------- wp-includes/js/quicktags.compressed.js | 1 - wp-includes/js/tw-sack.compressed.js | 1 - wp-includes/js/wp-ajax-js.php | 10 +++++----- wp-includes/l10n.php | 10 +++++++++- wp-includes/script-loader.php | 18 ++++++++--------- 9 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 wp-includes/js/dbx.compressed.js delete mode 100644 wp-includes/js/fat.compressed.js delete mode 100644 wp-includes/js/quicktags.compressed.js delete mode 100644 wp-includes/js/tw-sack.compressed.js (limited to 'wp-includes') diff --git a/wp-includes/js/crop/cropper.js b/wp-includes/js/crop/cropper.js index 2691153..d0cb8e4 100644 --- a/wp-includes/js/crop/cropper.js +++ b/wp-includes/js/crop/cropper.js @@ -109,7 +109,7 @@ this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"}); this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"}); this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"}); this.selArea=Builder.node("div",{"class":_f+"selArea"},[Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeNorth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeEast"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeSouth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeWest"},[Builder.node("span")]),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,Builder.node("div",{"class":_f+"clickArea"})]); -$(this.selArea).setStyle({backgroundColor:"transparent",backgroundRepeat:"no-repeat",backgroundPosition:"0 0"}); +Element.setStyle($(this.selArea),{backgroundColor:"transparent",backgroundRepeat:"no-repeat",backgroundPosition:"0 0"}); this.imgWrap.appendChild(this.img); this.imgWrap.appendChild(this.dragArea); this.dragArea.appendChild(this.selArea); @@ -131,17 +131,17 @@ this.setParams(); this.imgW=this.img.width; this.imgH=this.img.height; if(!this.isIE){ -$(this.overlay).setStyle({width:this.imgW+"px",height:this.imgH+"px"}); -$(this.overlay).hide(); -$(this.selArea).setStyle({backgroundImage:"url("+this.img.src+")"}); +Element.setStyle($(this.overlay),{width:this.imgW+"px",height:this.imgH+"px"}); +Element.hide($(this.overlay)); +Element.setStyle($(this.selArea),{backgroundImage:"url("+this.img.src+")"}); }else{ -$(this.north).setStyle({height:0}); -$(this.east).setStyle({width:0,height:0}); -$(this.south).setStyle({height:0}); -$(this.west).setStyle({width:0,height:0}); +Element.setStyle($(this.north),{height:0}); +Element.setStyle($(this.east),{width:0,height:0}); +Element.setStyle($(this.south),{height:0}); +Element.setStyle($(this.west),{width:0,height:0}); } -$(this.imgWrap).setStyle({"width":this.imgW+"px","height":this.imgH+"px"}); -$(this.selArea).hide(); +Element.setStyle($(this.imgWrap),{"width":this.imgW+"px","height":this.imgH+"px"}); +Element.hide($(this.selArea)); var _15=Position.positionedOffset(this.imgWrap); this.wrapOffsets={"top":_15[1],"left":_15[0]}; var _16={x1:0,y1:0,x2:0,y2:0}; @@ -151,7 +151,7 @@ _16.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2); _16.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2); _16.x2=_16.x1+this.options.ratioDim.x; _16.y2=_16.y1+this.options.ratioDim.y; -this.selArea.show(); +Element.show(this.selArea); this.drawArea(); this.endCrop(); } @@ -339,7 +339,7 @@ _37.a1=_37.a1=_37.a2-_3c; return _37; },drawArea:function(){ if(!this.isIE){ -$(this.overlay).show(); +Element.show($(this.overlay)); } var _3e=this.calcW(); var _3f=this.calcH(); @@ -402,10 +402,10 @@ fixEl.removeChild(n); },startResize:function(e){ this.startCoords=this.cloneCoords(this.areaCoords); this.resizing=true; -this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,""); +this.resizeHandle=Element.classNames(Event.element(e)).toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,""); Event.stop(e); },startDrag:function(e){ -this.selArea.show(); +Element.show(this.selArea); this.clickCoords=this.getCurPos(e); this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y}); this.dragging=true; @@ -496,8 +496,8 @@ this.previewWrap=$(this.options.previewWrap); this.previewImg=this.img.cloneNode(false); this.options.displayOnInit=true; this.hasPreviewImg=true; -this.previewWrap.addClassName("imgCrop_previewWrap"); -this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"}); +Element.addClassName(this.previewWrap,"imgCrop_previewWrap"); +Element.setStyle(this.previewWrap,{width:this.options.minWidth+"px",height:this.options.minHeight+"px"}); this.previewWrap.appendChild(this.previewImg); } },subDrawArea:function(){ @@ -513,4 +513,4 @@ _5d.height=_5c.h; _5d.left=_5c.x; _5d.top=_5c.y; } -}}); \ No newline at end of file +}}); diff --git a/wp-includes/js/dbx.compressed.js b/wp-includes/js/dbx.compressed.js deleted file mode 100644 index ea63740..0000000 --- a/wp-includes/js/dbx.compressed.js +++ /dev/null @@ -1 +0,0 @@ -var dbx;function dbxManager(_1){dbx=this;if(!/^[-_a-z0-9]+$/i.test(_1)){alert("Error from dbxManager:\n\""+_1+"\" is an invalid session ID");return;}this.supported=!(document.getElementsByTagName("*").length==0||(navigator.vendor=="KDE"&&typeof window.sidebar=="undefined"));if(!this.supported){return;}this.etype=typeof document.addEventListener!="undefined"?"addEventListener":typeof document.attachEvent!="undefined"?"attachEvent":"none";this.eprefix=(this.etype=="attachEvent"?"on":"");if(typeof window.opera!="undefined"&&parseFloat(navigator.userAgent.toLowerCase().split(/opera[\/ ]/)[1].split(" ")[0],10)<7.5){this.etype="none";}if(this.etype=="none"){this.supported=false;return;}this.running=0;this.sid=_1;this.savedata={};this.cookiestate=this.getCookieState();}dbxManager.prototype.setCookieState=function(){var _2=new Date();_2.setTime(_2.getTime()+(365*24*60*60*1000));var _3="";for(j in this.savedata){if(typeof this.savedata[j]!="function"){_3+=j+"="+this.savedata[j]+"&";}}this.state=_3.replace(/^(.+)&$/,"$1");this.cookiestring=this.state.replace(/,/g,"|");this.cookiestring=this.cookiestring.replace(/=/g,":");if(typeof this.onstatechange=="undefined"||this.onstatechange()){document.cookie="dbx-"+this.sid+"="+this.cookiestring+"; expires="+_2.toGMTString()+"; path=/";}};dbxManager.prototype.getCookieState=function(){this.cookiestate=null;if(document.cookie){if(document.cookie.indexOf("dbx-"+this.sid)!=-1){this.cookie=document.cookie.split("dbx-"+this.sid+"=")[1].split(";")[0].split("&");for(var i in this.cookie){if(typeof this.cookie[i]!="function"){this.cookie[i]=this.cookie[i].replace(/\|/g,",");this.cookie[i]=this.cookie[i].replace(/:/g,"=");this.cookie[i]=this.cookie[i].split("=");this.cookie[i][1]=this.cookie[i][1].split(",");}}this.cookiestate={};for(i in this.cookie){if(typeof this.cookie[i]!="function"){this.cookiestate[this.cookie[i][0]]=this.cookie[i][1];}}}}return this.cookiestate;};dbxManager.prototype.addDataMember=function(_5,_6){this.savedata[_5]=_6;};dbxManager.prototype.createElement=function(_7){return typeof document.createElementNS!="undefined"?document.createElementNS("http://www.w3.org/1999/xhtml",_7):document.createElement(_7);};dbxManager.prototype.getTarget=function(e,_9,_a){if(typeof _a!="undefined"){var _b=_a;}else{_b=typeof e.target!="undefined"?e.target:e.srcElement;}var _c=new RegExp(_9,"");while(!_c.test(_b.className)){_b=_b.parentNode;}return _b;};function dbxGroup(_d,_e,_f,fix,ani,_12,def,_14,_15,_16,_17,_18,_19,_1a){if(!/^[-_a-z0-9]+$/i.test(_d)){alert("Error from dbxGroup:\n\""+_d+"\" is an invalid container ID");return;}this.container=document.getElementById(_d);if(this.container==null||!dbx.supported){return;}var _1b=this;this.gid=_d;this.dragok=false;this.box=null;this.vertical=_e=="vertical";this.threshold=parseInt(_f,10);this.restrict=fix=="yes";this.resolution=parseInt(ani,10);this.toggles=_12=="yes";this.defopen=def!="closed";this.vocab={"open":_14,"close":_15,"move":_16,"toggle":_17,"kmove":_18,"ktoggle":_19,"syntax":_1a};this.container.style.position="relative";this.container.style.display="block";if(typeof window.opera!="undefined"){this.container.style.display="run-in";}this.boxes=[];this.buttons=[];this.order=[];this.eles=this.container.getElementsByTagName("*");for(var i=0;i0)){var _38=this.boxes[_35[i+(_33?1:-1)][0]];if(this.resolution>0){var _39={"x":_34.offsetLeft,"y":_34.offsetTop};var _3a={"x":_38.offsetLeft,"y":_38.offsetTop};}var obj={"insert":(_33?_38:_34),"before":(_33?_34:_38)};this.container.insertBefore(obj.insert,obj.before);if(this.resolution>0){var _3c={"sibling":new dbxAnimator(this,_38,_3a,this.resolution,true,_32),"parent":new dbxAnimator(this,_34,_39,this.resolution,true,_32)};}else{_32.focus();}break;}}}this.getBoxOrder();}};dbxGroup.prototype.compare=function(a,b){return a[1]-b[1];};dbxGroup.prototype.createTooltip=function(_3f,_40){if(this.keydown){this.tooltip=this.container.appendChild(dbx.createElement("span"));this.tooltip.style.visibility="hidden";this.tooltip.className="dbx-tooltip";if(_3f!=null){this.tooltip.appendChild(document.createTextNode(this.vocab.kmove+this.vocab.ktoggle.replace("%toggle%",_3f?this.vocab.close:this.vocab.open)));}else{this.tooltip.appendChild(document.createTextNode(this.vocab.kmove));}var _41=dbx.getTarget(null,"dbx-box",_40);this.tooltip.style.left=_41.offsetLeft+"px";this.tooltip.style.top=_41.offsetTop+"px";var _42=this.tooltip;window.setTimeout(function(){if(_42!=null){_42.style.visibility="visible";}},500);}};dbxGroup.prototype.removeTooltip=function(){if(this.tooltip!=null){this.tooltip.parentNode.removeChild(this.tooltip);this.tooltip=null;}};dbxGroup.prototype.mousedown=function(e,box){var _45=typeof e.target!="undefined"?e.target:e.srcElement;if(_45.nodeName=="#text"){_45=_45.parentNode;}if(!/dbx\-(toggle|box|group)/i.test(_45.className)){while(!/dbx\-(handle|box|group)/i.test(_45.className)){_45=_45.parentNode;}}if(/dbx\-handle/i.test(_45.className)){this.removeTooltip();this.released=false;this.initial={"x":e.clientX,"y":e.clientY};this.current={"x":0,"y":0};this.createCloneBox(box);if(typeof e.preventDefault!="undefined"){e.preventDefault();}if(typeof document.onselectstart!="undefined"){document.onselectstart=function(){return false;};}}};dbxGroup.prototype.mousemove=function(e){if(this.dragok&&this.box!=null){this.positive=this.vertical?(e.clientY>this.current.y?true:false):(e.clientX>this.current.x?true:false);this.current={"x":e.clientX,"y":e.clientY};var _47={"x":this.current.x-this.initial.x,"y":this.current.y-this.initial.y};if(((_47.x>=0&&_47.x<=this.threshold)||(_47.x<=0&&_47.x>=0-this.threshold))&&((_47.y>=0&&_47.y<=this.threshold)||(_47.y<=0&&_47.y>=0-this.threshold))){this.current.x-=_47.x;this.current.y-=_47.y;}if(this.released||_47.x>this.threshold||_47.x<(0-this.threshold)||_47.y>this.threshold||_47.y<(0-this.threshold)){dbx.group=this.container;dbx.box=this.box;dbx.event=e;if(typeof dbx.onboxdrag=="undefined"||dbx.onboxdrag()){this.released=true;if(!this.restrict||!this.vertical){this.boxclone.style.left=(this.current.x-this.difference.x)+"px";}if(!this.restrict||this.vertical){this.boxclone.style.top=(this.current.y-this.difference.y)+"px";}this.moveOriginalToPosition(this.current.x,this.current.y);if(typeof e.preventDefault!="undefined"){e.preventDefault();}}}}return true;};dbxGroup.prototype.mouseup=function(e){if(this.box!=null){this.moveOriginalToPosition(e.clientX,e.clientY);this.removeCloneBox();this.getBoxOrder();if(typeof document.onselectstart!="undefined"){document.onselectstart=function(){return true;};}}this.dragok=false;};dbxGroup.prototype.keypress=function(e,_4a){if(/^(3[7-9])|(40)$/.test(e.keyCode)){this.removeTooltip();if((this.vertical&&/^(38|40)$/.test(e.keyCode))||(!this.vertical&&/^(37|39)$/.test(e.keyCode))){this.shiftBoxPosition(e,_4a,/^[3][78]$/.test(e.keyCode)?false:true);if(typeof e.preventDefault!="undefined"){e.preventDefault();}else{return false;}typeof e.stopPropagation!="undefined"?e.stopPropagation():e.cancelBubble=true;this.keydown=false;}}return true;};dbxGroup.prototype.getBoxOrder=function(){this.order=[];var len=this.eles.length;for(var j=0;j_54.xy&&_51.xy<_54.xy)||(!this.positive&&_51.xy<_54.xy&&_51.xy+_51.wh>_54.xy)){if(this.boxes[i]==this.box){return;}var _55=this.box.nextSibling;while(_55.className==null||!/dbx\-box/.test(_55.className)){_55=_55.nextSibling;}if(this.boxes[i]==_55){return;}if(this.resolution>0){if(this.box[this.vertical?"offsetTop":"offsetLeft"]<_54.xy){var _56=this.boxes[i].previousSibling;while(_56.className==null||!/dbx\-box/.test(_56.className)){_56=_56.previousSibling;}}else{_56=this.boxes[i];}var _57={"x":_56.offsetLeft,"y":_56.offsetTop};}var _58={"x":this.box.offsetLeft,"y":this.box.offsetTop};this.container.insertBefore(this.box,this.boxes[i]);this.initial.x+=(this.box.offsetLeft-_58.x);this.initial.y+=(this.box.offsetTop-_58.y);if(this.resolution>0&&_56!=this.box){var _59=new dbxAnimator(this,_56,_57,this.resolution,false,null);}else{}break;}}};function dbxAnimator(_5a,box,pos,res,kbd,_5f){this.caller=_5a;this.box=box;this.timer=null;var _60=pos[this.caller.vertical?"y":"x"];var _61=this.box[this.caller.vertical?"offsetTop":"offsetLeft"];if(_60!=_61){if(dbx.running>this.caller.boxes.length-1){return;}var _62=this.caller.createClone(this.box,29999,arguments[2]);_62.style.visibility="visible";this.box.style.visibility="hidden";this.animateClone(_62,_60,_61>_60?_61-_60:0-(_60-_61),this.caller.vertical?"top":"left",res,kbd,_5f);}}dbxAnimator.prototype.animateClone=function(_63,_64,_65,dir,res,kbd,_69){var _6a=this;var _6b=0;dbx.running++;this.timer=window.setInterval(function(){_6b++;_64+=_65/res;_63.style[dir]=_64+"px";if(_6b==res){window.clearTimeout(_6a.timer);_6a.timer=null;dbx.running--;_6a.caller.container.removeChild(_63);_6a.box.style.visibility="visible";if(kbd){if(_69!=null&&_69.parentNode.style.visibility!="hidden"){_69.focus();}else{if(_6a.caller.toggles){var _6c=_6a.caller.buttons[parseInt(_6a.box.className.split("dbxid")[1],10)];if(_6c!=null&&typeof _6c.isactive!="undefined"){_6c.focus();}}}}}},20);};if(typeof window.attachEvent!="undefined"){window.attachEvent("onunload",function(){var ev=["mousedown","mousemove","mouseup","mouseout","click","keydown","keyup","focus","blur","selectstart","statechange","boxdrag","boxopen","boxclose"];var el=ev.length;var dl=document.all.length;for(var i=0;i"; }); if ( tempObj.showLink && showLinkMessage ) - ajaxAdd.myResponseElement.update(""); + Element.update(ajaxAdd.myResponseElement,""); } if ( tempObj.addComplete && typeof tempObj.addComplete == 'function' ) tempObj.addComplete( what, where, update, transport ); @@ -82,7 +82,7 @@ Object.extend(listMan.prototype, { var action = 'delete-' + what + '&id=' + id; var idName = what.replace('-as-spam','') + '-' + id; ajaxDel.addOnComplete( function(transport) { - ajaxDel.myResponseElement.update(''); + Element.update(ajaxDel.myResponseElement,''); tempObj.destore(action); if( tempObj.delComplete && typeof tempObj.delComplete == 'function' ) tempObj.delComplete( what, id, transport ); @@ -105,7 +105,7 @@ Object.extend(listMan.prototype, { var action = 'dim-' + what + '&id=' + id; var idName = what + '-' + id; ajaxDim.addOnComplete( function(transport) { - ajaxDim.myResponseElement.update(''); + Element.update(ajaxDim.myResponseElement,''); tempObj.destore(action); if ( tempObj.dimComplete && typeof tempObj.dimComplete == 'function' ) tempObj.dimComplete( what, id, dimClass, transport ); @@ -120,11 +120,11 @@ Object.extend(listMan.prototype, { addListItem: function( h ) { new Insertion[this.topAdder ? 'Top' : 'Bottom'](this.theList,h); - this.theList.cleanWhitespace(); + Element.cleanWhitespace(this.theList); var id = this.topAdder ? this.theList.firstChild.id : this.theList.lastChild.id; if ( this.alt ) if ( this.theList.childNodes.length % 2 ) - $(id).addClassName(this.alt); + Element.addClassName($(id),this.alt); Fat.fade_element(id); }, @@ -145,7 +145,7 @@ Object.extend(listMan.prototype, { replaceListItem: function( id, h, update ) { id = $(id); if ( !update ) { - id.remove(); + Element.remove(id); this.addListItem( h ); return; } @@ -156,14 +156,14 @@ Object.extend(listMan.prototype, { // toggles class dimItem: function( id, dimClass, noFade ) { id = $(id); - if ( id.hasClassName(dimClass) ) { + if ( Element.hasClassName(id,dimClass) ) { if ( !noFade ) Fat.fade_element(id.id,null,700,null); - id.removeClassName(dimClass); + Element.removeClassName(id,dimClass); } else { if ( !noFade ) Fat.fade_element(id.id,null,700,'#FF3333'); - id.addClassName(dimClass); + Element.addClassName(id,dimClass); } }, @@ -183,7 +183,7 @@ Object.extend(listMan.prototype, { this.theList.replaceChild(this.dataStore[action], $(id)); delete(this.dataStore[action]); if ( error ) { - func = function() { $(id).setStyle( { 'background-color': '#FF3333' } ); } + func = function() { Element.setStyle($(id),{backgroundColor:'#FF3333'}); } func(); setTimeout(func, 705); // Hit it twice in case it's still fading. } }, @@ -246,12 +246,12 @@ Object.extend(listMan.prototype, { return; var alt = this.alt; var offset = this.altOffset; - var listItems = $A(this.theList.childNodes).findAll( function(i) { return i.visible() } ); + var listItems = $A(this.theList.childNodes).findAll( function(i) { return Element.visible(i) } ); listItems.each( function(i,n) { if ( ( n + offset ) % 2 ) - i.removeClassName(alt); + Element.removeClassName(i,alt); else - i.addClassName(alt); + Element.addClassName(i,alt); }); } }); diff --git a/wp-includes/js/quicktags.compressed.js b/wp-includes/js/quicktags.compressed.js deleted file mode 100644 index bd6cade..0000000 --- a/wp-includes/js/quicktags.compressed.js +++ /dev/null @@ -1 +0,0 @@ -var edButtons=new Array();var edLinks=new Array();var edOpenTags=new Array();function edButton(id,_2,_3,_4,_5,_6){this.id=id;this.display=_2;this.tagStart=_3;this.tagEnd=_4;this.access=_5;this.open=_6;}function zeroise(_7,_8){var _9=_7.toString();if(_7<0){_9=_9.substr(1,_9.length);}while(_9.length<_8){_9="0"+_9;}if(_7<0){_9="-"+_9;}return _9;}var now=new Date();var datetime=now.getUTCFullYear()+"-"+zeroise(now.getUTCMonth()+1,2)+"-"+zeroise(now.getUTCDate(),2)+"T"+zeroise(now.getUTCHours(),2)+":"+zeroise(now.getUTCMinutes(),2)+":"+zeroise(now.getUTCSeconds(),2)+"+00:00";edButtons[edButtons.length]=new edButton("ed_strong","b","","","b");edButtons[edButtons.length]=new edButton("ed_em","i","","","i");edButtons[edButtons.length]=new edButton("ed_link","link","","","a");edButtons[edButtons.length]=new edButton("ed_block","b-quote","\n\n
","
\n\n","q");edButtons[edButtons.length]=new edButton("ed_del","del","","","d");edButtons[edButtons.length]=new edButton("ed_ins","ins","","","s");edButtons[edButtons.length]=new edButton("ed_img","img","","","m",-1);edButtons[edButtons.length]=new edButton("ed_ul","ul","
    \n","
\n\n","u");edButtons[edButtons.length]=new edButton("ed_ol","ol","
    \n","
\n\n","o");edButtons[edButtons.length]=new edButton("ed_li","li","\t
  • ","
    • \n","l");edButtons[edButtons.length]=new edButton("ed_code","code","","","c");edButtons[edButtons.length]=new edButton("ed_more","more","","","t",-1);function edLink(){this.display="";this.URL="";this.newWin=0;}edLinks[edLinks.length]=new edLink("WordPress","http://wordpress.org/");edLinks[edLinks.length]=new edLink("alexking.org","http://www.alexking.org/");function edShowButton(_a,i){if(_a.id=="ed_img"){document.write("");}else{if(_a.id=="ed_link"){document.write("");}else{document.write("");}}}function edShowLinks(){var _c="";document.write(_c);}function edAddTag(_d){if(edButtons[_d].tagEnd!=""){edOpenTags[edOpenTags.length]=_d;document.getElementById(edButtons[_d].id).value="/"+document.getElementById(edButtons[_d].id).value;}}function edRemoveTag(_e){for(i=0;i0){return true;}else{return false;}}function edCloseAllTags(){var _11=edOpenTags.length;for(o=0;o<_11;o++){edInsertTag(edCanvas,edOpenTags[edOpenTags.length-1]);}}function edQuickLink(i,_13){if(i>-1){var _14="";if(edLinks[i].newWin==1){_14=" target=\"_blank\"";}var _15=""+edLinks[i].display+"";_13.selectedIndex=0;edInsertContent(edCanvas,_15);}else{_13.selectedIndex=0;}}function edSpell(_16){var _17="";if(document.selection){_16.focus();var sel=document.selection.createRange();if(sel.text.length>0){_17=sel.text;}}else{if(_16.selectionStart||_16.selectionStart=="0"){var _19=_16.selectionStart;var _1a=_16.selectionEnd;if(_19!=_1a){_17=_16.value.substring(_19,_1a);}}}if(_17==""){_17=prompt("Enter a word to look up:","");}if(_17!==null&&/^\w[\w ]*$/.test(_17)){window.open("http://www.answers.com/"+escape(_17));}}function edToolbar(){document.write("
    ");for(i=0;i");document.write("");document.write("
    ");}function edInsertTag(_1b,i){if(document.selection){_1b.focus();sel=document.selection.createRange();if(sel.text.length>0){sel.text=edButtons[i].tagStart+sel.text+edButtons[i].tagEnd;}else{if(!edCheckOpenTags(i)||edButtons[i].tagEnd==""){sel.text=edButtons[i].tagStart;edAddTag(i);}else{sel.text=edButtons[i].tagEnd;edRemoveTag(i);}}_1b.focus();}else{if(_1b.selectionStart||_1b.selectionStart=="0"){var _1d=_1b.selectionStart;var _1e=_1b.selectionEnd;var _1f=_1e;var _20=_1b.scrollTop;if(_1d!=_1e){_1b.value=_1b.value.substring(0,_1d)+edButtons[i].tagStart+_1b.value.substring(_1d,_1e)+edButtons[i].tagEnd+_1b.value.substring(_1e,_1b.value.length);_1f+=edButtons[i].tagStart.length+edButtons[i].tagEnd.length;}else{if(!edCheckOpenTags(i)||edButtons[i].tagEnd==""){_1b.value=_1b.value.substring(0,_1d)+edButtons[i].tagStart+_1b.value.substring(_1e,_1b.value.length);edAddTag(i);_1f=_1d+edButtons[i].tagStart.length;}else{_1b.value=_1b.value.substring(0,_1d)+edButtons[i].tagEnd+_1b.value.substring(_1e,_1b.value.length);edRemoveTag(i);_1f=_1d+edButtons[i].tagEnd.length;}}_1b.focus();_1b.selectionStart=_1f;_1b.selectionEnd=_1f;_1b.scrollTop=_20;}else{if(!edCheckOpenTags(i)||edButtons[i].tagEnd==""){_1b.value+=edButtons[i].tagStart;edAddTag(i);}else{_1b.value+=edButtons[i].tagEnd;edRemoveTag(i);}_1b.focus();}}}function edInsertContent(_21,_22){if(document.selection){_21.focus();sel=document.selection.createRange();sel.text=_22;_21.focus();}else{if(_21.selectionStart||_21.selectionStart=="0"){var _23=_21.selectionStart;var _24=_21.selectionEnd;_21.value=_21.value.substring(0,_23)+_22+_21.value.substring(_24,_21.value.length);_21.focus();_21.selectionStart=_23+_22.length;_21.selectionEnd=_23+_22.length;}else{_21.value+=_22;_21.focus();}}}function edInsertLink(_25,i,_27){if(!_27){_27="http://";}if(!edCheckOpenTags(i)){var URL=prompt("Enter the URL",_27);if(URL){edButtons[i].tagStart="";edInsertTag(_25,i);}}else{edInsertTag(_25,i);}}function edInsertImage(_29){var _2a=prompt("Enter the URL of the image","http://");if(_2a){_2a="\""+prompt("Enter";edInsertContent(_29,_2a);}} \ No newline at end of file diff --git a/wp-includes/js/tw-sack.compressed.js b/wp-includes/js/tw-sack.compressed.js deleted file mode 100644 index 3674c46..0000000 --- a/wp-includes/js/tw-sack.compressed.js +++ /dev/null @@ -1 +0,0 @@ -function sack(_1){this.xmlhttp=null;this.resetData=function(){this.method="POST";this.queryStringSeparator="?";this.argumentSeparator="&";this.URLString="";this.encodeURIString=true;this.execute=false;this.element=null;this.elementObj=null;this.requestFile=_1;this.vars=new Object();this.responseStatus=new Array(2);};this.resetFunctions=function(){this.onLoading=function(){};this.onLoaded=function(){};this.onInteractive=function(){};this.onCompletion=function(){};this.onError=function(){};this.onFail=function(){};};this.reset=function(){this.resetFunctions();this.resetData();};this.createAJAX=function(){try{this.xmlhttp=new ActiveXObject("Msxml2.XMLHTTP");}catch(e1){try{this.xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");}catch(e2){this.xmlhttp=null;}}if(!this.xmlhttp){if(typeof XMLHttpRequest!="undefined"){this.xmlhttp=new XMLHttpRequest();}else{this.failed=true;}}};this.setVar=function(_2,_3){this.vars[_2]=Array(_3,false);};this.encVar=function(_4,_5,_6){if(true==_6){return Array(encodeURIComponent(_4),encodeURIComponent(_5));}else{this.vars[encodeURIComponent(_4)]=Array(encodeURIComponent(_5),true);}};this.processURLString=function(_7,_8){encoded=encodeURIComponent(this.argumentSeparator);regexp=new RegExp(this.argumentSeparator+"|"+encoded);varArray=_7.split(regexp);for(i=0;i' + b.firstChild.nodeValue + '

    '; } ); - this.myResponseElement.update('
    ' + msg + '
    '); + Element.update(this.myResponseElement,'
    ' + msg + '
    '); return false; } return true; } var r = this.transport.responseText; if ( isNaN(r) ) { - this.myResponseElement.update('

    ' + r + '

    '); + Element.update(this.myResponseElement,'

    ' + r + '

    '); return false; } var r = parseInt(r,10); if ( -1 == r ) { - this.myResponseElement.update("

    "); + Element.update(this.myResponseElement,"

    "); return false; } else if ( 0 == r ) { - this.myResponseElement.update("

    "); + Element.update(this.myResponseElement,"

    "); return false; } return true; diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 7408e17..4a0a640 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -10,7 +10,7 @@ function get_locale() { $locale = WPLANG; if (empty($locale)) - $locale = 'en_US'; + $locale = ''; $locale = apply_filters('locale', $locale); @@ -69,6 +69,9 @@ function load_default_textdomain() { global $l10n; $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; + $mofile = ABSPATH . LANGDIR . "/$locale.mo"; load_textdomain('default', $mofile); @@ -76,6 +79,9 @@ function load_default_textdomain() { function load_plugin_textdomain($domain, $path = false) { $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; + if ( false === $path ) $path = PLUGINDIR; @@ -85,6 +91,8 @@ function load_plugin_textdomain($domain, $path = false) { function load_theme_textdomain($domain) { $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; $mofile = get_template_directory() . "/$locale.mo"; load_textdomain($domain, $mofile); diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 63af673..17042bb 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -10,18 +10,18 @@ class WP_Scripts { } function default_scripts() { - $this->add( 'dbx', '/wp-includes/js/dbx.compressed.js', false, '2.05' ); - $this->add( 'fat', '/wp-includes/js/fat.compressed.js', false, '1.0-RC1_3660' ); - $this->add( 'sack', '/wp-includes/js/tw-sack.compressed.js', false, '1.6.1' ); - $this->add( 'quicktags', '/wp-includes/js/quicktags.compressed.js', false, '3517' ); + $this->add( 'dbx', '/wp-includes/js/dbx.js', false, '2.05' ); + $this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' ); + $this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' ); + $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' ); $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' ); $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20061113' ); $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php'); $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20061113' ); $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0'); $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116'); - $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459'); - $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583'); + $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '20070118'); + $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '20070118'); $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.6.1'); $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.6.1'); $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder'), '1.6.1'); @@ -29,16 +29,16 @@ class WP_Scripts { $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.6.1'); $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.6.1'); $this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.6.1'); - $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '1'); + $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118'); if ( is_admin() ) { $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' ); - $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' ); + $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '20070118' ); $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' ); $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' ); $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' ); $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' ); $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); - $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070116' ); + $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070118' ); } } -- cgit