Commit 81828917 authored by Jason Morawski's avatar Jason Morawski Committed by David Prévot

Imported Debian patch 1.4.3+dfsg-1

parents 69bf5e2d cdaf76a8
debian/patches
dojo (1.4.3+dfsg-1) unstable; urgency=low
* New upstream version
-- Jason Morawski <rpgdude1@gmail.com> Mon, 07 Jun 2010 08:40:01 -0400
dojo (1.4.2+dfsg-1) unstable; urgency=low
* New upstream version
......
......@@ -107,7 +107,7 @@ _16("decrementMonth","month",-1);
_16("nextYearLabelNode","year",1);
_16("previousYearLabelNode","year",-1);
},goToToday:function(){
this.attr("value",this.dateClassObj());
this.attr("value",new this.dateClassObj());
},constructor:function(_1a){
var _1b=(_1a.datePackage&&(_1a.datePackage!="dojo.date"))?_1a.datePackage+".Date":"Date";
this.dateClassObj=dojo.getObject(_1b,false);
......
......@@ -701,7 +701,7 @@ break;
if(_4b.nodeType==1){
_4a=true;
var tg=_4b.tagName?_4b.tagName.toLowerCase():"";
if(/br|input|img|base|meta|area|basefont/.test(tg)){
if(/br|input|img|base|meta|area|basefont|hr|link/.test(tg)){
this._sCall("selectElement",[_4b]);
}else{
this._sCall("selectElementChildren",[_4b]);
......
This diff is collapsed.
......@@ -6768,7 +6768,7 @@ dojo.declare("dijit._editor.RichText", dijit._Widget, {
isvalid=true;
var tg = first.tagName ? first.tagName.toLowerCase() : "";
// Collapse before childless tags.
if(/br|input|img|base|meta|area|basefont/.test(tg)){
if(/br|input|img|base|meta|area|basefont|hr|link/.test(tg)){
this._sCall("selectElement", [ first ]);
}else{
// Collapse inside tags with children.
......@@ -18203,7 +18203,7 @@ dojo.declare(
goToToday: function(){
// summary:
// Sets calendar's value to today's date
this.attr('value', this.dateClassObj());
this.attr('value', new this.dateClassObj());
},
constructor: function(/*Object*/args){
......@@ -24357,10 +24357,12 @@ dojo.declare("dijit.layout.ScrollingTabController",
this.inherited(arguments);
var menuItem;
if(this.useMenu){
var containerId = this.containerId;
menuItem = new dijit.MenuItem({
label: page.title,
onClick: dojo.hitch(this, function(){
this.onSelectChild(page);
var container = dijit.byId(containerId);
container.selectChild(page);
})
});
this._menuChildren[page.id] = menuItem;
......
......@@ -28,17 +28,19 @@ this._postStartup=true;
this.inherited(arguments);
var _3;
if(this.useMenu){
var _4=this.containerId;
_3=new dijit.MenuItem({label:_1.title,onClick:dojo.hitch(this,function(){
this.onSelectChild(_1);
var _5=dijit.byId(_4);
_5.selectChild(_1);
})});
this._menuChildren[_1.id]=_3;
this._menu.addChild(_3,_2);
}
this.pane2handles[_1.id].push(this.connect(this.pane2button[_1.id],"attr",function(_4,_5){
this.pane2handles[_1.id].push(this.connect(this.pane2button[_1.id],"attr",function(_6,_7){
if(this._postStartup){
if(arguments.length==2&&_4=="label"){
if(arguments.length==2&&_6=="label"){
if(_3){
_3.attr(_4,_5);
_3.attr(_6,_7);
}
if(this._dim){
this.resize(this._dim);
......@@ -47,26 +49,26 @@ this.resize(this._dim);
}
}));
dojo.style(this.containerNode,"width",(dojo.style(this.containerNode,"width")+200)+"px");
},onRemoveChild:function(_6,_7){
var _8=this.pane2button[_6.id];
if(this._selectedTab===_8.domNode){
},onRemoveChild:function(_8,_9){
var _a=this.pane2button[_8.id];
if(this._selectedTab===_a.domNode){
this._selectedTab=null;
}
if(this.useMenu&&_6&&_6.id&&this._menuChildren[_6.id]){
this._menu.removeChild(this._menuChildren[_6.id]);
this._menuChildren[_6.id].destroy();
delete this._menuChildren[_6.id];
if(this.useMenu&&_8&&_8.id&&this._menuChildren[_8.id]){
this._menu.removeChild(this._menuChildren[_8.id]);
this._menuChildren[_8.id].destroy();
delete this._menuChildren[_8.id];
}
this.inherited(arguments);
},_initButtons:function(){
this._menuChildren={};
this._btnWidth=0;
this._buttons=dojo.query("> .tabStripButton",this.domNode).filter(function(_9){
if((this.useMenu&&_9==this._menuBtn.domNode)||(this.useSlider&&(_9==this._rightBtn.domNode||_9==this._leftBtn.domNode))){
this._btnWidth+=dojo.marginBox(_9).w;
this._buttons=dojo.query("> .tabStripButton",this.domNode).filter(function(_b){
if((this.useMenu&&_b==this._menuBtn.domNode)||(this.useSlider&&(_b==this._rightBtn.domNode||_b==this._leftBtn.domNode))){
this._btnWidth+=dojo.marginBox(_b).w;
return true;
}else{
dojo.style(_9,"display","none");
dojo.style(_b,"display","none");
return false;
}
},this);
......@@ -75,28 +77,28 @@ this._menu=new dijit.Menu({id:this.id+"_menu",targetNodeIds:[this._menuBtn.domNo
this._supportingWidgets.push(this._menu);
}
},_getTabsWidth:function(){
var _a=this.getChildren();
if(_a.length){
var _b=_a[this.isLeftToRight()?0:_a.length-1].domNode,_c=_a[this.isLeftToRight()?_a.length-1:0].domNode;
return _c.offsetLeft+dojo.style(_c,"width")-_b.offsetLeft;
var _c=this.getChildren();
if(_c.length){
var _d=_c[this.isLeftToRight()?0:_c.length-1].domNode,_e=_c[this.isLeftToRight()?_c.length-1:0].domNode;
return _e.offsetLeft+dojo.style(_e,"width")-_d.offsetLeft;
}else{
return 0;
}
},_enableBtn:function(_d){
var _e=this._getTabsWidth();
_d=_d||dojo.style(this.scrollNode,"width");
return _e>0&&_d<_e;
},resize:function(_f){
},_enableBtn:function(_f){
var _10=this._getTabsWidth();
_f=_f||dojo.style(this.scrollNode,"width");
return _10>0&&_f<_10;
},resize:function(dim){
if(this.domNode.offsetWidth==0){
return;
}
this._dim=_f;
this._dim=dim;
this.scrollNode.style.height="auto";
this._contentBox=dijit.layout.marginBox2contentBox(this.domNode,{h:0,w:_f.w});
this._contentBox=dijit.layout.marginBox2contentBox(this.domNode,{h:0,w:dim.w});
this._contentBox.h=this.scrollNode.offsetHeight;
dojo.contentBox(this.domNode,this._contentBox);
var _10=this._enableBtn(this._contentBox.w);
this._buttons.style("display",_10?"":"none");
var _11=this._enableBtn(this._contentBox.w);
this._buttons.style("display",_11?"":"none");
this._leftBtn.layoutAlign="left";
this._rightBtn.layoutAlign="right";
this._menuBtn.layoutAlign=this.isLeftToRight()?"right":"left";
......@@ -113,58 +115,58 @@ return sl;
if(this.isLeftToRight()||dojo.isIE<8||dojo.isQuirks||dojo.isWebKit){
return val;
}else{
var _11=dojo.style(this.containerNode,"width")-dojo.style(this.scrollNode,"width");
return (dojo.isIE==8?-1:1)*(val-_11);
var _12=dojo.style(this.containerNode,"width")-dojo.style(this.scrollNode,"width");
return (dojo.isIE==8?-1:1)*(val-_12);
}
},onSelectChild:function(_12){
var tab=this.pane2button[_12.id];
if(!tab||!_12){
},onSelectChild:function(_13){
var tab=this.pane2button[_13.id];
if(!tab||!_13){
return;
}
var _13=tab.domNode;
if(_13!=this._selectedTab){
this._selectedTab=_13;
var _14=tab.domNode;
if(_14!=this._selectedTab){
this._selectedTab=_14;
var sl=this._getScroll();
if(sl>_13.offsetLeft||sl+dojo.style(this.scrollNode,"width")<_13.offsetLeft+dojo.style(_13,"width")){
if(sl>_14.offsetLeft||sl+dojo.style(this.scrollNode,"width")<_14.offsetLeft+dojo.style(_14,"width")){
this.createSmoothScroll().play();
}
}
this.inherited(arguments);
},_getScrollBounds:function(){
var _14=this.getChildren(),_15=dojo.style(this.scrollNode,"width"),_16=dojo.style(this.containerNode,"width"),_17=_16-_15,_18=this._getTabsWidth();
if(_14.length&&_18>_15){
return {min:this.isLeftToRight()?0:_14[_14.length-1].domNode.offsetLeft,max:this.isLeftToRight()?(_14[_14.length-1].domNode.offsetLeft+dojo.style(_14[_14.length-1].domNode,"width"))-_15:_17};
var _15=this.getChildren(),_16=dojo.style(this.scrollNode,"width"),_17=dojo.style(this.containerNode,"width"),_18=_17-_16,_19=this._getTabsWidth();
if(_15.length&&_19>_16){
return {min:this.isLeftToRight()?0:_15[_15.length-1].domNode.offsetLeft,max:this.isLeftToRight()?(_15[_15.length-1].domNode.offsetLeft+dojo.style(_15[_15.length-1].domNode,"width"))-_16:_18};
}else{
var _19=this.isLeftToRight()?0:_17;
return {min:_19,max:_19};
var _1a=this.isLeftToRight()?0:_18;
return {min:_1a,max:_1a};
}
},_getScrollForSelectedTab:function(){
var w=this.scrollNode,n=this._selectedTab,_1a=dojo.style(this.scrollNode,"width"),_1b=this._getScrollBounds();
var pos=(n.offsetLeft+dojo.style(n,"width")/2)-_1a/2;
pos=Math.min(Math.max(pos,_1b.min),_1b.max);
var w=this.scrollNode,n=this._selectedTab,_1b=dojo.style(this.scrollNode,"width"),_1c=this._getScrollBounds();
var pos=(n.offsetLeft+dojo.style(n,"width")/2)-_1b/2;
pos=Math.min(Math.max(pos,_1c.min),_1c.max);
return pos;
},createSmoothScroll:function(x){
if(arguments.length>0){
var _1c=this._getScrollBounds();
x=Math.min(Math.max(x,_1c.min),_1c.max);
var _1d=this._getScrollBounds();
x=Math.min(Math.max(x,_1d.min),_1d.max);
}else{
x=this._getScrollForSelectedTab();
}
if(this._anim&&this._anim.status()=="playing"){
this._anim.stop();
}
var _1d=this,w=this.scrollNode,_1e=new dojo._Animation({beforeBegin:function(){
var _1e=this,w=this.scrollNode,_1f=new dojo._Animation({beforeBegin:function(){
if(this.curve){
delete this.curve;
}
var _1f=w.scrollLeft,_20=_1d._convertToScrollLeft(x);
_1e.curve=new dojo._Line(_1f,_20);
var _20=w.scrollLeft,_21=_1e._convertToScrollLeft(x);
_1f.curve=new dojo._Line(_20,_21);
},onAnimate:function(val){
w.scrollLeft=val;
}});
this._anim=_1e;
this._anim=_1f;
this._setButtonClass(x);
return _1e;
return _1f;
},_getBtnNode:function(e){
var n=e.target;
while(n&&!dojo.hasClass(n,"tabStripButton")){
......@@ -175,19 +177,19 @@ return n;
this.doSlide(1,this._getBtnNode(e));
},doSlideLeft:function(e){
this.doSlide(-1,this._getBtnNode(e));
},doSlide:function(_21,_22){
if(_22&&dojo.hasClass(_22,"dijitTabBtnDisabled")){
},doSlide:function(_22,_23){
if(_23&&dojo.hasClass(_23,"dijitTabBtnDisabled")){
return;
}
var _23=dojo.style(this.scrollNode,"width");
var d=(_23*0.75)*_21;
var _24=dojo.style(this.scrollNode,"width");
var d=(_24*0.75)*_22;
var to=this._getScroll()+d;
this._setButtonClass(to);
this.createSmoothScroll(to).play();
},_setButtonClass:function(_24){
var cls="dijitTabBtnDisabled",_25=this._getScrollBounds();
dojo.toggleClass(this._leftBtn.domNode,cls,_24<=_25.min);
dojo.toggleClass(this._rightBtn.domNode,cls,_24>=_25.max);
},_setButtonClass:function(_25){
var cls="dijitTabBtnDisabled",_26=this._getScrollBounds();
dojo.toggleClass(this._leftBtn.domNode,cls,_25<=_26.min);
dojo.toggleClass(this._rightBtn.domNode,cls,_25>=_26.max);
}});
dojo.declare("dijit.layout._ScrollingTabControllerButton",dijit.form.Button,{baseClass:"dijitTab",buttonType:"",buttonClass:"",tabPosition:"top",templateString:dojo.cache("dijit.layout","templates/_ScrollingTabControllerButton.html","<div id=\"${id}-${buttonType}\" class=\"tabStripButton dijitTab ${buttonClass} tabStripButton-${tabPosition}\"\n\t\tdojoAttachEvent=\"onclick:_onButtonClick,onmouseenter:_onMouse,onmouseleave:_onMouse,onmousedown:_onMouse\">\n\t<div role=\"presentation\" wairole=\"presentation\" class=\"dijitTabInnerDiv\" dojoattachpoint=\"innerDiv,focusNode\">\n\t\t<div role=\"presentation\" wairole=\"presentation\" class=\"dijitTabContent dijitButtonContents\" dojoattachpoint=\"tabContent\">\n\t\t\t<img src=\"${_blankGif}\"/>\n\t\t\t<span dojoAttachPoint=\"containerNode,titleNode\" class=\"dijitButtonText\"></span>\n\t\t</div>\n\t</div>\n</div>\n"),tabIndex:""});
}
......@@ -48,8 +48,8 @@ d.config[_2]=djConfig[_2];
}
}
dojo.locale=d.config.locale;
var _3="$Rev: 21516 $".match(/\d+/);
dojo.version={major:1,minor:4,patch:2,flag:"",revision:_3?+_3[0]:NaN,toString:function(){
var _3="$Rev: 21629 $".match(/\d+/);
dojo.version={major:1,minor:4,patch:3,flag:"",revision:_3?+_3[0]:NaN,toString:function(){
with(d.version){
return major+"."+minor+"."+patch+flag+" ("+revision+")";
}
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -271,7 +271,7 @@ dojo.global = {
=====*/
dojo.locale = d.config.locale;
var rev = "$Rev: 21516 $".match(/\d+/);
var rev = "$Rev: 21629 $".match(/\d+/);
/*=====
dojo.version = function(){
......@@ -295,7 +295,7 @@ dojo.global = {
}
=====*/
dojo.version = {
major: 1, minor: 4, patch: 2, flag: "",
major: 1, minor: 4, patch: 3, flag: "",
revision: rev ? +rev[0] : NaN,
toString: function(){
with(d.version){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment