eliminate Cropper conflicts with jQuery

This commit is contained in:
Zach Prezkuta 2013-06-01 10:42:51 -06:00
commit 127b7a589e
72 changed files with 1659 additions and 1817 deletions

View file

@ -40,17 +40,17 @@ JavaScript:
1. 1.
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
2. 2.
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
3. 3.
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
4. 4.
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
5. 5.
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
6. 6.
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
7. 7.
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
8. 8.
} }

View file

@ -13,554 +13,556 @@
* http://www.opensource.org/licenses/bsd-license.php * http://www.opensource.org/licenses/bsd-license.php
* *
* See scriptaculous.js for full scriptaculous licence * See scriptaculous.js for full scriptaculous licence
*
* Modified 2013/06/01 Zach P to change $() to $PR() for eliminating conflicts with jQuery
*/ */
var CropDraggable=Class.create(); var CropDraggable=Class.create();
Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){ Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){
this.options=Object.extend({drawMethod:function(){ this.options=Object.extend({drawMethod:function(){
}},arguments[1]||{}); }},arguments[1]||{});
this.element=$(_1); this.element=$PR(_1);
this.handle=this.element; this.handle=this.element;
this.delta=this.currentDelta(); this.delta=this.currentDelta();
this.dragging=false; this.dragging=false;
this.eventMouseDown=this.initDrag.bindAsEventListener(this); this.eventMouseDown=this.initDrag.bindAsEventListener(this);
Event.observe(this.handle,"mousedown",this.eventMouseDown); Event.observe(this.handle,"mousedown",this.eventMouseDown);
Draggables.register(this); Draggables.register(this);
},draw:function(_2){ },draw:function(_2){
var _3=Position.cumulativeOffset(this.element); var _3=Position.cumulativeOffset(this.element);
var d=this.currentDelta(); var d=this.currentDelta();
_3[0]-=d[0]; _3[0]-=d[0];
_3[1]-=d[1]; _3[1]-=d[1];
var p=[0,1].map(function(i){ var p=[0,1].map(function(i){
return (_2[i]-_3[i]-this.offset[i]); return (_2[i]-_3[i]-this.offset[i]);
}.bind(this)); }.bind(this));
this.options.drawMethod(p); this.options.drawMethod(p);
}}); }});
var Cropper={}; var Cropper={};
Cropper.Img=Class.create(); Cropper.Img=Class.create();
Cropper.Img.prototype={initialize:function(_7,_8){ Cropper.Img.prototype={initialize:function(_7,_8){
this.options=Object.extend({ratioDim:{x:0,y:0},minWidth:0,minHeight:0,displayOnInit:false,onEndCrop:Prototype.emptyFunction,captureKeys:true,onloadCoords:null,maxWidth:0,maxHeight:0},_8||{}); this.options=Object.extend({ratioDim:{x:0,y:0},minWidth:0,minHeight:0,displayOnInit:false,onEndCrop:Prototype.emptyFunction,captureKeys:true,onloadCoords:null,maxWidth:0,maxHeight:0},_8||{});
this.img=$(_7); this.img=$PR(_7);
this.clickCoords={x:0,y:0}; this.clickCoords={x:0,y:0};
this.dragging=false; this.dragging=false;
this.resizing=false; this.resizing=false;
this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent); this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent);
this.isIE=/MSIE/.test(navigator.userAgent); this.isIE=/MSIE/.test(navigator.userAgent);
this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent); this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent);
this.ratioX=0; this.ratioX=0;
this.ratioY=0; this.ratioY=0;
this.attached=false; this.attached=false;
this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth)); this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth));
this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight)); this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight));
if(typeof this.img=="undefined"){ if(typeof this.img=="undefined"){
return; return;
} }
$A(document.getElementsByTagName("script")).each(function(s){ $A(document.getElementsByTagName("script")).each(function(s){
if(s.src.match(/cropper\.js/)){ if(s.src.match(/cropper\.js/)){
var _a=s.src.replace(/cropper\.js(.*)?/,""); var _a=s.src.replace(/cropper\.js(.*)?/,"");
var _b=document.createElement("link"); var _b=document.createElement("link");
_b.rel="stylesheet"; _b.rel="stylesheet";
_b.type="text/css"; _b.type="text/css";
_b.href=_a+"cropper.css"; _b.href=_a+"cropper.css";
_b.media="screen"; _b.media="screen";
document.getElementsByTagName("head")[0].appendChild(_b); document.getElementsByTagName("head")[0].appendChild(_b);
} }
}); });
if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){ if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){
var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y); var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y);
this.ratioX=this.options.ratioDim.x/_c; this.ratioX=this.options.ratioDim.x/_c;
this.ratioY=this.options.ratioDim.y/_c; this.ratioY=this.options.ratioDim.y/_c;
} }
this.subInitialize(); this.subInitialize();
if(this.img.complete||this.isWebKit){ if(this.img.complete||this.isWebKit){
this.onLoad(); this.onLoad();
}else{ }else{
Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this)); Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this));
} }
},getGCD:function(a,b){ },getGCD:function(a,b){
if(b==0){ if(b==0){
return a; return a;
} }
return this.getGCD(b,a%b); return this.getGCD(b,a%b);
},onLoad:function(){ },onLoad:function(){
var _f="imgCrop_"; var _f="imgCrop_";
var _10=this.img.parentNode; var _10=this.img.parentNode;
var _11=""; var _11="";
if(this.isOpera8){ if(this.isOpera8){
_11=" opera8"; _11=" opera8";
} }
this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11}); this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11});
this.north=Builder.node("div",{"class":_f+"overlay "+_f+"north"},[Builder.node("span")]); this.north=Builder.node("div",{"class":_f+"overlay "+_f+"north"},[Builder.node("span")]);
this.east=Builder.node("div",{"class":_f+"overlay "+_f+"east"},[Builder.node("span")]); this.east=Builder.node("div",{"class":_f+"overlay "+_f+"east"},[Builder.node("span")]);
this.south=Builder.node("div",{"class":_f+"overlay "+_f+"south"},[Builder.node("span")]); this.south=Builder.node("div",{"class":_f+"overlay "+_f+"south"},[Builder.node("span")]);
this.west=Builder.node("div",{"class":_f+"overlay "+_f+"west"},[Builder.node("span")]); this.west=Builder.node("div",{"class":_f+"overlay "+_f+"west"},[Builder.node("span")]);
var _12=[this.north,this.east,this.south,this.west]; var _12=[this.north,this.east,this.south,this.west];
this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12); this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12);
this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"}); this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"});
this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"}); this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"});
this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"}); this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"});
this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"}); this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"});
this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"}); this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"});
this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"}); this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"});
this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"}); this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"});
this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"}); 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=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.imgWrap.appendChild(this.img); this.imgWrap.appendChild(this.img);
this.imgWrap.appendChild(this.dragArea); this.imgWrap.appendChild(this.dragArea);
this.dragArea.appendChild(this.selArea); this.dragArea.appendChild(this.selArea);
this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"})); this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"}));
_10.appendChild(this.imgWrap); _10.appendChild(this.imgWrap);
this.startDragBind=this.startDrag.bindAsEventListener(this); this.startDragBind=this.startDrag.bindAsEventListener(this);
Event.observe(this.dragArea,"mousedown",this.startDragBind); Event.observe(this.dragArea,"mousedown",this.startDragBind);
this.onDragBind=this.onDrag.bindAsEventListener(this); this.onDragBind=this.onDrag.bindAsEventListener(this);
Event.observe(document,"mousemove",this.onDragBind); Event.observe(document,"mousemove",this.onDragBind);
this.endCropBind=this.endCrop.bindAsEventListener(this); this.endCropBind=this.endCrop.bindAsEventListener(this);
Event.observe(document,"mouseup",this.endCropBind); Event.observe(document,"mouseup",this.endCropBind);
this.resizeBind=this.startResize.bindAsEventListener(this); this.resizeBind=this.startResize.bindAsEventListener(this);
this.handles=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW]; this.handles=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW];
this.registerHandles(true); this.registerHandles(true);
if(this.options.captureKeys){ if(this.options.captureKeys){
this.keysBind=this.handleKeys.bindAsEventListener(this); this.keysBind=this.handleKeys.bindAsEventListener(this);
Event.observe(document,"keypress",this.keysBind); Event.observe(document,"keypress",this.keysBind);
} }
new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)}); new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)});
this.setParams(); this.setParams();
},registerHandles:function(_13){ },registerHandles:function(_13){
for(var i=0;i<this.handles.length;i++){ for(var i=0;i<this.handles.length;i++){
var _15=$(this.handles[i]); var _15=$PR(this.handles[i]);
if(_13){ if(_13){
var _16=false; var _16=false;
if(this.fixedWidth&&this.fixedHeight){ if(this.fixedWidth&&this.fixedHeight){
_16=true; _16=true;
}else{ }else{
if(this.fixedWidth||this.fixedHeight){ if(this.fixedWidth||this.fixedHeight){
var _17=_15.className.match(/([S|N][E|W])$/); var _17=_15.className.match(/([S|N][E|W])$/);
var _18=_15.className.match(/(E|W)$/); var _18=_15.className.match(/(E|W)$/);
var _19=_15.className.match(/(N|S)$/); var _19=_15.className.match(/(N|S)$/);
if(_17){ if(_17){
_16=true; _16=true;
}else{ }else{
if(this.fixedWidth&&_18){ if(this.fixedWidth&&_18){
_16=true; _16=true;
}else{ }else{
if(this.fixedHeight&&_19){ if(this.fixedHeight&&_19){
_16=true; _16=true;
} }
} }
} }
} }
} }
if(_16){ if(_16){
_15.hide(); _15.hide();
}else{ }else{
Event.observe(_15,"mousedown",this.resizeBind); Event.observe(_15,"mousedown",this.resizeBind);
} }
}else{ }else{
_15.show(); _15.show();
Event.stopObserving(_15,"mousedown",this.resizeBind); Event.stopObserving(_15,"mousedown",this.resizeBind);
} }
} }
},setParams:function(){ },setParams:function(){
this.imgW=this.img.width; this.imgW=this.img.width;
this.imgH=this.img.height; this.imgH=this.img.height;
$(this.north).setStyle({height:0}); $PR(this.north).setStyle({height:0});
$(this.east).setStyle({width:0,height:0}); $PR(this.east).setStyle({width:0,height:0});
$(this.south).setStyle({height:0}); $PR(this.south).setStyle({height:0});
$(this.west).setStyle({width:0,height:0}); $PR(this.west).setStyle({width:0,height:0});
$(this.imgWrap).setStyle({"width":this.imgW+"px","height":this.imgH+"px"}); $PR(this.imgWrap).setStyle({"width":this.imgW+"px","height":this.imgH+"px"});
$(this.selArea).hide(); $PR(this.selArea).hide();
var _1a={x1:0,y1:0,x2:0,y2:0}; var _1a={x1:0,y1:0,x2:0,y2:0};
var _1b=false; var _1b=false;
if(this.options.onloadCoords!=null){ if(this.options.onloadCoords!=null){
_1a=this.cloneCoords(this.options.onloadCoords); _1a=this.cloneCoords(this.options.onloadCoords);
_1b=true; _1b=true;
}else{ }else{
if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){ if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){
_1a.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2); _1a.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2);
_1a.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2); _1a.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2);
_1a.x2=_1a.x1+this.options.ratioDim.x; _1a.x2=_1a.x1+this.options.ratioDim.x;
_1a.y2=_1a.y1+this.options.ratioDim.y; _1a.y2=_1a.y1+this.options.ratioDim.y;
_1b=true; _1b=true;
} }
} }
this.setAreaCoords(_1a,false,false,1); this.setAreaCoords(_1a,false,false,1);
if(this.options.displayOnInit&&_1b){ if(this.options.displayOnInit&&_1b){
this.selArea.show(); this.selArea.show();
this.drawArea(); this.drawArea();
this.endCrop(); this.endCrop();
} }
this.attached=true; this.attached=true;
},remove:function(){ },remove:function(){
if(this.attached){ if(this.attached){
this.attached=false; this.attached=false;
this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap); this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap);
this.imgWrap.parentNode.removeChild(this.imgWrap); this.imgWrap.parentNode.removeChild(this.imgWrap);
Event.stopObserving(this.dragArea,"mousedown",this.startDragBind); Event.stopObserving(this.dragArea,"mousedown",this.startDragBind);
Event.stopObserving(document,"mousemove",this.onDragBind); Event.stopObserving(document,"mousemove",this.onDragBind);
Event.stopObserving(document,"mouseup",this.endCropBind); Event.stopObserving(document,"mouseup",this.endCropBind);
this.registerHandles(false); this.registerHandles(false);
if(this.options.captureKeys){ if(this.options.captureKeys){
Event.stopObserving(document,"keypress",this.keysBind); Event.stopObserving(document,"keypress",this.keysBind);
} }
} }
},reset:function(){ },reset:function(){
if(!this.attached){ if(!this.attached){
this.onLoad(); this.onLoad();
}else{ }else{
this.setParams(); this.setParams();
} }
this.endCrop(); this.endCrop();
},handleKeys:function(e){ },handleKeys:function(e){
var dir={x:0,y:0}; var dir={x:0,y:0};
if(!this.dragging){ if(!this.dragging){
switch(e.keyCode){ switch(e.keyCode){
case (37): case (37):
dir.x=-1; dir.x=-1;
break; break;
case (38): case (38):
dir.y=-1; dir.y=-1;
break; break;
case (39): case (39):
dir.x=1; dir.x=1;
break; break;
case (40): case (40):
dir.y=1; dir.y=1;
break; break;
} }
if(dir.x!=0||dir.y!=0){ if(dir.x!=0||dir.y!=0){
if(e.shiftKey){ if(e.shiftKey){
dir.x*=10; dir.x*=10;
dir.y*=10; dir.y*=10;
} }
this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]); this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]);
Event.stop(e); Event.stop(e);
} }
} }
},calcW:function(){ },calcW:function(){
return (this.areaCoords.x2-this.areaCoords.x1); return (this.areaCoords.x2-this.areaCoords.x1);
},calcH:function(){ },calcH:function(){
return (this.areaCoords.y2-this.areaCoords.y1); return (this.areaCoords.y2-this.areaCoords.y1);
},moveArea:function(_1e){ },moveArea:function(_1e){
this.setAreaCoords({x1:_1e[0],y1:_1e[1],x2:_1e[0]+this.calcW(),y2:_1e[1]+this.calcH()},true,false); this.setAreaCoords({x1:_1e[0],y1:_1e[1],x2:_1e[0]+this.calcW(),y2:_1e[1]+this.calcH()},true,false);
this.drawArea(); this.drawArea();
},cloneCoords:function(_1f){ },cloneCoords:function(_1f){
return {x1:_1f.x1,y1:_1f.y1,x2:_1f.x2,y2:_1f.y2}; return {x1:_1f.x1,y1:_1f.y1,x2:_1f.x2,y2:_1f.y2};
},setAreaCoords:function(_20,_21,_22,_23,_24){ },setAreaCoords:function(_20,_21,_22,_23,_24){
if(_21){ if(_21){
var _25=_20.x2-_20.x1; var _25=_20.x2-_20.x1;
var _26=_20.y2-_20.y1; var _26=_20.y2-_20.y1;
if(_20.x1<0){ if(_20.x1<0){
_20.x1=0; _20.x1=0;
_20.x2=_25; _20.x2=_25;
} }
if(_20.y1<0){ if(_20.y1<0){
_20.y1=0; _20.y1=0;
_20.y2=_26; _20.y2=_26;
} }
if(_20.x2>this.imgW){ if(_20.x2>this.imgW){
_20.x2=this.imgW; _20.x2=this.imgW;
_20.x1=this.imgW-_25; _20.x1=this.imgW-_25;
} }
if(_20.y2>this.imgH){ if(_20.y2>this.imgH){
_20.y2=this.imgH; _20.y2=this.imgH;
_20.y1=this.imgH-_26; _20.y1=this.imgH-_26;
} }
}else{ }else{
if(_20.x1<0){ if(_20.x1<0){
_20.x1=0; _20.x1=0;
} }
if(_20.y1<0){ if(_20.y1<0){
_20.y1=0; _20.y1=0;
} }
if(_20.x2>this.imgW){ if(_20.x2>this.imgW){
_20.x2=this.imgW; _20.x2=this.imgW;
} }
if(_20.y2>this.imgH){ if(_20.y2>this.imgH){
_20.y2=this.imgH; _20.y2=this.imgH;
} }
if(_23!=null){ if(_23!=null){
if(this.ratioX>0){ if(this.ratioX>0){
this.applyRatio(_20,{x:this.ratioX,y:this.ratioY},_23,_24); this.applyRatio(_20,{x:this.ratioX,y:this.ratioY},_23,_24);
}else{ }else{
if(_22){ if(_22){
this.applyRatio(_20,{x:1,y:1},_23,_24); this.applyRatio(_20,{x:1,y:1},_23,_24);
} }
} }
var _27=[this.options.minWidth,this.options.minHeight]; var _27=[this.options.minWidth,this.options.minHeight];
var _28=[this.options.maxWidth,this.options.maxHeight]; var _28=[this.options.maxWidth,this.options.maxHeight];
if(_27[0]>0||_27[1]>0||_28[0]>0||_28[1]>0){ if(_27[0]>0||_27[1]>0||_28[0]>0||_28[1]>0){
var _29={a1:_20.x1,a2:_20.x2}; var _29={a1:_20.x1,a2:_20.x2};
var _2a={a1:_20.y1,a2:_20.y2}; var _2a={a1:_20.y1,a2:_20.y2};
var _2b={min:0,max:this.imgW}; var _2b={min:0,max:this.imgW};
var _2c={min:0,max:this.imgH}; var _2c={min:0,max:this.imgH};
if((_27[0]!=0||_27[1]!=0)&&_22){ if((_27[0]!=0||_27[1]!=0)&&_22){
if(_27[0]>0){ if(_27[0]>0){
_27[1]=_27[0]; _27[1]=_27[0];
}else{ }else{
if(_27[1]>0){ if(_27[1]>0){
_27[0]=_27[1]; _27[0]=_27[1];
} }
} }
} }
if((_28[0]!=0||_28[0]!=0)&&_22){ if((_28[0]!=0||_28[0]!=0)&&_22){
if(_28[0]>0&&_28[0]<=_28[1]){ if(_28[0]>0&&_28[0]<=_28[1]){
_28[1]=_28[0]; _28[1]=_28[0];
}else{ }else{
if(_28[1]>0&&_28[1]<=_28[0]){ if(_28[1]>0&&_28[1]<=_28[0]){
_28[0]=_28[1]; _28[0]=_28[1];
} }
} }
} }
if(_27[0]>0){ if(_27[0]>0){
this.applyDimRestriction(_29,_27[0],_23.x,_2b,"min"); this.applyDimRestriction(_29,_27[0],_23.x,_2b,"min");
} }
if(_27[1]>1){ if(_27[1]>1){
this.applyDimRestriction(_2a,_27[1],_23.y,_2c,"min"); this.applyDimRestriction(_2a,_27[1],_23.y,_2c,"min");
} }
if(_28[0]>0){ if(_28[0]>0){
this.applyDimRestriction(_29,_28[0],_23.x,_2b,"max"); this.applyDimRestriction(_29,_28[0],_23.x,_2b,"max");
} }
if(_28[1]>1){ if(_28[1]>1){
this.applyDimRestriction(_2a,_28[1],_23.y,_2c,"max"); this.applyDimRestriction(_2a,_28[1],_23.y,_2c,"max");
} }
_20={x1:_29.a1,y1:_2a.a1,x2:_29.a2,y2:_2a.a2}; _20={x1:_29.a1,y1:_2a.a1,x2:_29.a2,y2:_2a.a2};
} }
} }
} }
this.areaCoords=_20; this.areaCoords=_20;
},applyDimRestriction:function(_2d,val,_2f,_30,_31){ },applyDimRestriction:function(_2d,val,_2f,_30,_31){
var _32; var _32;
if(_31=="min"){ if(_31=="min"){
_32=((_2d.a2-_2d.a1)<val); _32=((_2d.a2-_2d.a1)<val);
}else{ }else{
_32=((_2d.a2-_2d.a1)>val); _32=((_2d.a2-_2d.a1)>val);
} }
if(_32){ if(_32){
if(_2f==1){ if(_2f==1){
_2d.a2=_2d.a1+val; _2d.a2=_2d.a1+val;
}else{ }else{
_2d.a1=_2d.a2-val; _2d.a1=_2d.a2-val;
} }
if(_2d.a1<_30.min){ if(_2d.a1<_30.min){
_2d.a1=_30.min; _2d.a1=_30.min;
_2d.a2=val; _2d.a2=val;
}else{ }else{
if(_2d.a2>_30.max){ if(_2d.a2>_30.max){
_2d.a1=_30.max-val; _2d.a1=_30.max-val;
_2d.a2=_30.max; _2d.a2=_30.max;
} }
} }
} }
},applyRatio:function(_33,_34,_35,_36){ },applyRatio:function(_33,_34,_35,_36){
var _37; var _37;
if(_36=="N"||_36=="S"){ if(_36=="N"||_36=="S"){
_37=this.applyRatioToAxis({a1:_33.y1,b1:_33.x1,a2:_33.y2,b2:_33.x2},{a:_34.y,b:_34.x},{a:_35.y,b:_35.x},{min:0,max:this.imgW}); _37=this.applyRatioToAxis({a1:_33.y1,b1:_33.x1,a2:_33.y2,b2:_33.x2},{a:_34.y,b:_34.x},{a:_35.y,b:_35.x},{min:0,max:this.imgW});
_33.x1=_37.b1; _33.x1=_37.b1;
_33.y1=_37.a1; _33.y1=_37.a1;
_33.x2=_37.b2; _33.x2=_37.b2;
_33.y2=_37.a2; _33.y2=_37.a2;
}else{ }else{
_37=this.applyRatioToAxis({a1:_33.x1,b1:_33.y1,a2:_33.x2,b2:_33.y2},{a:_34.x,b:_34.y},{a:_35.x,b:_35.y},{min:0,max:this.imgH}); _37=this.applyRatioToAxis({a1:_33.x1,b1:_33.y1,a2:_33.x2,b2:_33.y2},{a:_34.x,b:_34.y},{a:_35.x,b:_35.y},{min:0,max:this.imgH});
_33.x1=_37.a1; _33.x1=_37.a1;
_33.y1=_37.b1; _33.y1=_37.b1;
_33.x2=_37.a2; _33.x2=_37.a2;
_33.y2=_37.b2; _33.y2=_37.b2;
} }
},applyRatioToAxis:function(_38,_39,_3a,_3b){ },applyRatioToAxis:function(_38,_39,_3a,_3b){
var _3c=Object.extend(_38,{}); var _3c=Object.extend(_38,{});
var _3d=_3c.a2-_3c.a1; var _3d=_3c.a2-_3c.a1;
var _3e=Math.floor(_3d*_39.b/_39.a); var _3e=Math.floor(_3d*_39.b/_39.a);
var _3f; var _3f;
var _40; var _40;
var _41=null; var _41=null;
if(_3a.b==1){ if(_3a.b==1){
_3f=_3c.b1+_3e; _3f=_3c.b1+_3e;
if(_3f>_3b.max){ if(_3f>_3b.max){
_3f=_3b.max; _3f=_3b.max;
_41=_3f-_3c.b1; _41=_3f-_3c.b1;
} }
_3c.b2=_3f; _3c.b2=_3f;
}else{ }else{
_3f=_3c.b2-_3e; _3f=_3c.b2-_3e;
if(_3f<_3b.min){ if(_3f<_3b.min){
_3f=_3b.min; _3f=_3b.min;
_41=_3f+_3c.b2; _41=_3f+_3c.b2;
} }
_3c.b1=_3f; _3c.b1=_3f;
} }
if(_41!=null){ if(_41!=null){
_40=Math.floor(_41*_39.a/_39.b); _40=Math.floor(_41*_39.a/_39.b);
if(_3a.a==1){ if(_3a.a==1){
_3c.a2=_3c.a1+_40; _3c.a2=_3c.a1+_40;
}else{ }else{
_3c.a1=_3c.a1=_3c.a2-_40; _3c.a1=_3c.a1=_3c.a2-_40;
} }
} }
return _3c; return _3c;
},drawArea:function(){ },drawArea:function(){
var _42=this.calcW(); var _42=this.calcW();
var _43=this.calcH(); var _43=this.calcH();
var px="px"; var px="px";
var _45=[this.areaCoords.x1+px,this.areaCoords.y1+px,_42+px,_43+px,this.areaCoords.x2+px,this.areaCoords.y2+px,(this.img.width-this.areaCoords.x2)+px,(this.img.height-this.areaCoords.y2)+px]; var _45=[this.areaCoords.x1+px,this.areaCoords.y1+px,_42+px,_43+px,this.areaCoords.x2+px,this.areaCoords.y2+px,(this.img.width-this.areaCoords.x2)+px,(this.img.height-this.areaCoords.y2)+px];
var _46=this.selArea.style; var _46=this.selArea.style;
_46.left=_45[0]; _46.left=_45[0];
_46.top=_45[1]; _46.top=_45[1];
_46.width=_45[2]; _46.width=_45[2];
_46.height=_45[3]; _46.height=_45[3];
var _47=Math.ceil((_42-6)/2)+px; var _47=Math.ceil((_42-6)/2)+px;
var _48=Math.ceil((_43-6)/2)+px; var _48=Math.ceil((_43-6)/2)+px;
this.handleN.style.left=_47; this.handleN.style.left=_47;
this.handleE.style.top=_48; this.handleE.style.top=_48;
this.handleS.style.left=_47; this.handleS.style.left=_47;
this.handleW.style.top=_48; this.handleW.style.top=_48;
this.north.style.height=_45[1]; this.north.style.height=_45[1];
var _49=this.east.style; var _49=this.east.style;
_49.top=_45[1]; _49.top=_45[1];
_49.height=_45[3]; _49.height=_45[3];
_49.left=_45[4]; _49.left=_45[4];
_49.width=_45[6]; _49.width=_45[6];
var _4a=this.south.style; var _4a=this.south.style;
_4a.top=_45[5]; _4a.top=_45[5];
_4a.height=_45[7]; _4a.height=_45[7];
var _4b=this.west.style; var _4b=this.west.style;
_4b.top=_45[1]; _4b.top=_45[1];
_4b.height=_45[3]; _4b.height=_45[3];
_4b.width=_45[0]; _4b.width=_45[0];
this.subDrawArea(); this.subDrawArea();
this.forceReRender(); this.forceReRender();
},forceReRender:function(){ },forceReRender:function(){
if(this.isIE||this.isWebKit){ if(this.isIE||this.isWebKit){
var n=document.createTextNode(" "); var n=document.createTextNode(" ");
var d,el,fixEL,i; var d,el,fixEL,i;
if(this.isIE){ if(this.isIE){
fixEl=this.selArea; fixEl=this.selArea;
}else{ }else{
if(this.isWebKit){ if(this.isWebKit){
fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0]; fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0];
d=Builder.node("div",""); d=Builder.node("div","");
d.style.visibility="hidden"; d.style.visibility="hidden";
var _4e=["SE","S","SW"]; var _4e=["SE","S","SW"];
for(i=0;i<_4e.length;i++){ for(i=0;i<_4e.length;i++){
el=document.getElementsByClassName("imgCrop_handle"+_4e[i],this.selArea)[0]; el=document.getElementsByClassName("imgCrop_handle"+_4e[i],this.selArea)[0];
if(el.childNodes.length){ if(el.childNodes.length){
el.removeChild(el.childNodes[0]); el.removeChild(el.childNodes[0]);
} }
el.appendChild(d); el.appendChild(d);
} }
} }
} }
fixEl.appendChild(n); fixEl.appendChild(n);
fixEl.removeChild(n); fixEl.removeChild(n);
} }
},startResize:function(e){ },startResize:function(e){
this.startCoords=this.cloneCoords(this.areaCoords); this.startCoords=this.cloneCoords(this.areaCoords);
this.resizing=true; this.resizing=true;
this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,""); this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,"");
Event.stop(e); Event.stop(e);
},startDrag:function(e){ },startDrag:function(e){
this.selArea.show(); this.selArea.show();
this.clickCoords=this.getCurPos(e); this.clickCoords=this.getCurPos(e);
this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y},false,false,null); this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y},false,false,null);
this.dragging=true; this.dragging=true;
this.onDrag(e); this.onDrag(e);
Event.stop(e); Event.stop(e);
},getCurPos:function(e){ },getCurPos:function(e){
var el=this.imgWrap,wrapOffsets=Position.cumulativeOffset(el); var el=this.imgWrap,wrapOffsets=Position.cumulativeOffset(el);
while(el.nodeName!="BODY"){ while(el.nodeName!="BODY"){
wrapOffsets[1]-=el.scrollTop||0; wrapOffsets[1]-=el.scrollTop||0;
wrapOffsets[0]-=el.scrollLeft||0; wrapOffsets[0]-=el.scrollLeft||0;
el=el.parentNode; el=el.parentNode;
} }
return curPos={x:Event.pointerX(e)-wrapOffsets[0],y:Event.pointerY(e)-wrapOffsets[1]}; return curPos={x:Event.pointerX(e)-wrapOffsets[0],y:Event.pointerY(e)-wrapOffsets[1]};
},onDrag:function(e){ },onDrag:function(e){
if(this.dragging||this.resizing){ if(this.dragging||this.resizing){
var _54=null; var _54=null;
var _55=this.getCurPos(e); var _55=this.getCurPos(e);
var _56=this.cloneCoords(this.areaCoords); var _56=this.cloneCoords(this.areaCoords);
var _57={x:1,y:1}; var _57={x:1,y:1};
if(this.dragging){ if(this.dragging){
if(_55.x<this.clickCoords.x){ if(_55.x<this.clickCoords.x){
_57.x=-1; _57.x=-1;
} }
if(_55.y<this.clickCoords.y){ if(_55.y<this.clickCoords.y){
_57.y=-1; _57.y=-1;
} }
this.transformCoords(_55.x,this.clickCoords.x,_56,"x"); this.transformCoords(_55.x,this.clickCoords.x,_56,"x");
this.transformCoords(_55.y,this.clickCoords.y,_56,"y"); this.transformCoords(_55.y,this.clickCoords.y,_56,"y");
}else{ }else{
if(this.resizing){ if(this.resizing){
_54=this.resizeHandle; _54=this.resizeHandle;
if(_54.match(/E/)){ if(_54.match(/E/)){
this.transformCoords(_55.x,this.startCoords.x1,_56,"x"); this.transformCoords(_55.x,this.startCoords.x1,_56,"x");
if(_55.x<this.startCoords.x1){ if(_55.x<this.startCoords.x1){
_57.x=-1; _57.x=-1;
} }
}else{ }else{
if(_54.match(/W/)){ if(_54.match(/W/)){
this.transformCoords(_55.x,this.startCoords.x2,_56,"x"); this.transformCoords(_55.x,this.startCoords.x2,_56,"x");
if(_55.x<this.startCoords.x2){ if(_55.x<this.startCoords.x2){
_57.x=-1; _57.x=-1;
} }
} }
} }
if(_54.match(/N/)){ if(_54.match(/N/)){
this.transformCoords(_55.y,this.startCoords.y2,_56,"y"); this.transformCoords(_55.y,this.startCoords.y2,_56,"y");
if(_55.y<this.startCoords.y2){ if(_55.y<this.startCoords.y2){
_57.y=-1; _57.y=-1;
} }
}else{ }else{
if(_54.match(/S/)){ if(_54.match(/S/)){
this.transformCoords(_55.y,this.startCoords.y1,_56,"y"); this.transformCoords(_55.y,this.startCoords.y1,_56,"y");
if(_55.y<this.startCoords.y1){ if(_55.y<this.startCoords.y1){
_57.y=-1; _57.y=-1;
} }
} }
} }
} }
} }
this.setAreaCoords(_56,false,e.shiftKey,_57,_54); this.setAreaCoords(_56,false,e.shiftKey,_57,_54);
this.drawArea(); this.drawArea();
Event.stop(e); Event.stop(e);
} }
},transformCoords:function(_58,_59,_5a,_5b){ },transformCoords:function(_58,_59,_5a,_5b){
var _5c=[_58,_59]; var _5c=[_58,_59];
if(_58>_59){ if(_58>_59){
_5c.reverse(); _5c.reverse();
} }
_5a[_5b+"1"]=_5c[0]; _5a[_5b+"1"]=_5c[0];
_5a[_5b+"2"]=_5c[1]; _5a[_5b+"2"]=_5c[1];
},endCrop:function(){ },endCrop:function(){
this.dragging=false; this.dragging=false;
this.resizing=false; this.resizing=false;
this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()}); this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()});
},subInitialize:function(){ },subInitialize:function(){
},subDrawArea:function(){ },subDrawArea:function(){
}}; }};
Cropper.ImgWithPreview=Class.create(); Cropper.ImgWithPreview=Class.create();
Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){ Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){
this.hasPreviewImg=false; this.hasPreviewImg=false;
if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){ if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){
this.previewWrap=$(this.options.previewWrap); this.previewWrap=$PR(this.options.previewWrap);
this.previewImg=this.img.cloneNode(false); this.previewImg=this.img.cloneNode(false);
this.previewImg.id="imgCrop_"+this.previewImg.id; this.previewImg.id="imgCrop_"+this.previewImg.id;
this.options.displayOnInit=true; this.options.displayOnInit=true;
this.hasPreviewImg=true; this.hasPreviewImg=true;
this.previewWrap.addClassName("imgCrop_previewWrap"); this.previewWrap.addClassName("imgCrop_previewWrap");
this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"}); this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"});
this.previewWrap.appendChild(this.previewImg); this.previewWrap.appendChild(this.previewImg);
} }
},subDrawArea:function(){ },subDrawArea:function(){
if(this.hasPreviewImg){ if(this.hasPreviewImg){
var _5d=this.calcW(); var _5d=this.calcW();
var _5e=this.calcH(); var _5e=this.calcH();
var _5f={x:this.imgW/_5d,y:this.imgH/_5e}; var _5f={x:this.imgW/_5d,y:this.imgH/_5e};
var _60={x:_5d/this.options.minWidth,y:_5e/this.options.minHeight}; var _60={x:_5d/this.options.minWidth,y:_5e/this.options.minHeight};
var _61={w:Math.ceil(this.options.minWidth*_5f.x)+"px",h:Math.ceil(this.options.minHeight*_5f.y)+"px",x:"-"+Math.ceil(this.areaCoords.x1/_60.x)+"px",y:"-"+Math.ceil(this.areaCoords.y1/_60.y)+"px"}; var _61={w:Math.ceil(this.options.minWidth*_5f.x)+"px",h:Math.ceil(this.options.minHeight*_5f.y)+"px",x:"-"+Math.ceil(this.areaCoords.x1/_60.x)+"px",y:"-"+Math.ceil(this.areaCoords.y1/_60.y)+"px"};
var _62=this.previewImg.style; var _62=this.previewImg.style;
_62.width=_61.w; _62.width=_61.w;
_62.height=_61.h; _62.height=_61.h;
_62.left=_61.x; _62.left=_61.x;
_62.top=_61.y; _62.top=_61.y;
} }
}}); }});

View file

@ -113,6 +113,8 @@
* http://www.opensource.org/licenses/bsd-license.php * http://www.opensource.org/licenses/bsd-license.php
* *
* See scriptaculous.js for full scriptaculous licence * See scriptaculous.js for full scriptaculous licence
*
* Modified 2013/06/01 Zach P to change $() to $PR() for eliminating conflicts with jQuery
*/ */
/** /**
@ -134,7 +136,7 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
arguments[1] || {} arguments[1] || {}
); );
this.element = $(element); this.element = $PR(element);
this.handle = this.element; this.handle = this.element;
@ -212,12 +214,12 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
* *
* Example: * Example:
* function onEndCrop( coords, dimensions ) { * function onEndCrop( coords, dimensions ) {
* $( 'x1' ).value = coords.x1; * $PR( 'x1' ).value = coords.x1;
* $( 'y1' ).value = coords.y1; * $PR( 'y1' ).value = coords.y1;
* $( 'x2' ).value = coords.x2; * $PR( 'x2' ).value = coords.x2;
* $( 'y2' ).value = coords.y2; * $PR( 'y2' ).value = coords.y2;
* $( 'width' ).value = dimensions.width; * $PR( 'width' ).value = dimensions.width;
* $( 'height' ).value = dimensions.height; * $PR( 'height' ).value = dimensions.height;
* } * }
* *
*/ */
@ -288,7 +290,7 @@ Cropper.Img.prototype = {
* @var obj * @var obj
* The img node to attach to * The img node to attach to
*/ */
this.img = $( element ); this.img = $PR( element );
/** /**
* @var obj * @var obj
* The x & y coordinates of the click point * The x & y coordinates of the click point
@ -524,7 +526,7 @@ Cropper.Img.prototype = {
*/ */
registerHandles: function( registration ) { registerHandles: function( registration ) {
for( var i = 0; i < this.handles.length; i++ ) { for( var i = 0; i < this.handles.length; i++ ) {
var handle = $( this.handles[i] ); var handle = $PR( this.handles[i] );
if( registration ) { if( registration ) {
var hideHandle = false; // whether to hide the handle var hideHandle = false; // whether to hide the handle
@ -569,16 +571,16 @@ Cropper.Img.prototype = {
*/ */
this.imgH = this.img.height; this.imgH = this.img.height;
$( this.north ).setStyle( { height: 0 } ); $PR( this.north ).setStyle( { height: 0 } );
$( this.east ).setStyle( { width: 0, height: 0 } ); $PR( this.east ).setStyle( { width: 0, height: 0 } );
$( this.south ).setStyle( { height: 0 } ); $PR( this.south ).setStyle( { height: 0 } );
$( this.west ).setStyle( { width: 0, height: 0 } ); $PR( this.west ).setStyle( { width: 0, height: 0 } );
// resize the container to fit the image // resize the container to fit the image
$( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } ); $PR( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
// hide the select area // hide the select area
$( this.selArea ).hide(); $PR( this.selArea ).hide();
// setup the starting position of the select area // setup the starting position of the select area
var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 }; var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 };
@ -1263,7 +1265,7 @@ Object.extend( Object.extend( Cropper.ImgWithPreview.prototype, Cropper.Img.prot
* The preview image wrapper element * The preview image wrapper element
* @var obj HTML element * @var obj HTML element
*/ */
this.previewWrap = $( this.options.previewWrap ); this.previewWrap = $PR( this.options.previewWrap );
/** /**
* The preview image element * The preview image element
* @var obj HTML IMG element * @var obj HTML IMG element

View file

@ -37,8 +37,8 @@ var Autocompleter = {}
Autocompleter.Base = function() {}; Autocompleter.Base = function() {};
Autocompleter.Base.prototype = { Autocompleter.Base.prototype = {
baseInitialize: function(element, update, options) { baseInitialize: function(element, update, options) {
this.element = $(element); this.element = $PR(element);
this.update = $(update); this.update = $PR(update);
this.hasFocus = false; this.hasFocus = false;
this.changed = false; this.changed = false;
this.active = false; this.active = false;
@ -88,7 +88,7 @@ Autocompleter.Base.prototype = {
'<iframe id="' + this.update.id + '_iefix" '+ '<iframe id="' + this.update.id + '_iefix" '+
'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
'src="javascript:false;" frameborder="0" scrolling="no"></iframe>'); 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
this.iefix = $(this.update.id+'_iefix'); this.iefix = $PR(this.update.id+'_iefix');
} }
if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
}, },
@ -456,7 +456,7 @@ Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
Ajax.InPlaceEditor.prototype = { Ajax.InPlaceEditor.prototype = {
initialize: function(element, url, options) { initialize: function(element, url, options) {
this.url = url; this.url = url;
this.element = $(element); this.element = $PR(element);
this.options = Object.extend({ this.options = Object.extend({
okButton: true, okButton: true,
@ -491,14 +491,14 @@ Ajax.InPlaceEditor.prototype = {
if(!this.options.formId && this.element.id) { if(!this.options.formId && this.element.id) {
this.options.formId = this.element.id + "-inplaceeditor"; this.options.formId = this.element.id + "-inplaceeditor";
if ($(this.options.formId)) { if ($PR(this.options.formId)) {
// there's already a form with that name, don't specify an id // there's already a form with that name, don't specify an id
this.options.formId = null; this.options.formId = null;
} }
} }
if (this.options.externalControl) { if (this.options.externalControl) {
this.options.externalControl = $(this.options.externalControl); this.options.externalControl = $PR(this.options.externalControl);
} }
this.originalBackground = Element.getStyle(this.element, 'background-color'); this.originalBackground = Element.getStyle(this.element, 'background-color');
@ -796,7 +796,7 @@ Form.Element.DelayedObserver = Class.create();
Form.Element.DelayedObserver.prototype = { Form.Element.DelayedObserver.prototype = {
initialize: function(element, delay, callback) { initialize: function(element, delay, callback) {
this.delay = delay || 0.5; this.delay = delay || 0.5;
this.element = $(element); this.element = $PR(element);
this.callback = callback; this.callback = callback;
this.timer = null; this.timer = null;
this.lastValue = $F(this.element); this.lastValue = $F(this.element);

View file

@ -9,11 +9,11 @@ var Droppables = {
drops: [], drops: [],
remove: function(element) { remove: function(element) {
this.drops = this.drops.reject(function(d) { return d.element==$(element) }); this.drops = this.drops.reject(function(d) { return d.element==$PR(element) });
}, },
add: function(element) { add: function(element) {
element = $(element); element = $PR(element);
var options = Object.extend({ var options = Object.extend({
greedy: true, greedy: true,
hoverclass: null, hoverclass: null,
@ -26,9 +26,9 @@ var Droppables = {
var containment = options.containment; var containment = options.containment;
if((typeof containment == 'object') && if((typeof containment == 'object') &&
(containment.constructor == Array)) { (containment.constructor == Array)) {
containment.each( function(c) { options._containers.push($(c)) }); containment.each( function(c) { options._containers.push($PR(c)) });
} else { } else {
options._containers.push($(containment)); options._containers.push($PR(containment));
} }
} }
@ -228,17 +228,17 @@ Draggable.prototype = {
snap: false // false, or xy or [x,y] or function(x,y){ return [x,y] } snap: false // false, or xy or [x,y] or function(x,y){ return [x,y] }
}, arguments[1] || {}); }, arguments[1] || {});
this.element = $(element); this.element = $PR(element);
if(options.handle && (typeof options.handle == 'string')) { if(options.handle && (typeof options.handle == 'string')) {
var h = Element.childrenWithClassName(this.element, options.handle, true); var h = Element.childrenWithClassName(this.element, options.handle, true);
if(h.length>0) this.handle = h[0]; if(h.length>0) this.handle = h[0];
} }
if(!this.handle) this.handle = $(options.handle); if(!this.handle) this.handle = $PR(options.handle);
if(!this.handle) this.handle = this.element; if(!this.handle) this.handle = this.element;
if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
options.scroll = $(options.scroll); options.scroll = $PR(options.scroll);
Element.makePositioned(this.element); // fix IE Element.makePositioned(this.element); // fix IE
@ -508,7 +508,7 @@ Draggable.prototype = {
var SortableObserver = Class.create(); var SortableObserver = Class.create();
SortableObserver.prototype = { SortableObserver.prototype = {
initialize: function(element, observer) { initialize: function(element, observer) {
this.element = $(element); this.element = $PR(element);
this.observer = observer; this.observer = observer;
this.lastValue = Sortable.serialize(this.element); this.lastValue = Sortable.serialize(this.element);
}, },
@ -535,7 +535,7 @@ var Sortable = {
}, },
options: function(element) { options: function(element) {
element = Sortable._findRootElement($(element)); element = Sortable._findRootElement($PR(element));
if(!element) return; if(!element) return;
return Sortable.sortables[element.id]; return Sortable.sortables[element.id];
}, },
@ -553,7 +553,7 @@ var Sortable = {
}, },
create: function(element) { create: function(element) {
element = $(element); element = $PR(element);
var options = Object.extend({ var options = Object.extend({
element: element, element: element,
tag: 'li', // assumes li children, override with tag: 'tagname' tag: 'li', // assumes li children, override with tag: 'tagname'
@ -744,7 +744,7 @@ var Sortable = {
if(sortable && !sortable.ghosting) return; if(sortable && !sortable.ghosting) return;
if(!Sortable._marker) { if(!Sortable._marker) {
Sortable._marker = $('dropmarker') || document.createElement('DIV'); Sortable._marker = $PR('dropmarker') || document.createElement('DIV');
Element.hide(Sortable._marker); Element.hide(Sortable._marker);
Element.addClassName(Sortable._marker, 'dropmarker'); Element.addClassName(Sortable._marker, 'dropmarker');
Sortable._marker.style.position = 'absolute'; Sortable._marker.style.position = 'absolute';
@ -802,7 +802,7 @@ var Sortable = {
}, },
tree: function(element) { tree: function(element) {
element = $(element); element = $PR(element);
var sortableOptions = this.options(element); var sortableOptions = this.options(element);
var options = Object.extend({ var options = Object.extend({
tag: sortableOptions.tag, tag: sortableOptions.tag,
@ -833,16 +833,16 @@ var Sortable = {
}, },
sequence: function(element) { sequence: function(element) {
element = $(element); element = $PR(element);
var options = Object.extend(this.options(element), arguments[1] || {}); var options = Object.extend(this.options(element), arguments[1] || {});
return $(this.findElements(element, options) || []).map( function(item) { return $PR(this.findElements(element, options) || []).map( function(item) {
return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
}); });
}, },
setSequence: function(element, new_sequence) { setSequence: function(element, new_sequence) {
element = $(element); element = $PR(element);
var options = Object.extend(this.options(element), arguments[2] || {}); var options = Object.extend(this.options(element), arguments[2] || {});
var nodeMap = {}; var nodeMap = {};
@ -862,7 +862,7 @@ var Sortable = {
}, },
serialize: function(element) { serialize: function(element) {
element = $(element); element = $PR(element);
var options = Object.extend(Sortable.options(element), arguments[1] || {}); var options = Object.extend(Sortable.options(element), arguments[1] || {});
var name = encodeURIComponent( var name = encodeURIComponent(
(arguments[1] && arguments[1].name) ? arguments[1].name : element.id); (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
@ -912,4 +912,4 @@ Element.offsetSize = function (element, type) {
return element.offsetHeight; return element.offsetHeight;
else else
return element.offsetWidth; return element.offsetWidth;
} }

View file

@ -25,14 +25,14 @@ String.prototype.parseColor = function() {
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
Element.collectTextNodes = function(element) { Element.collectTextNodes = function(element) {
return $A($(element).childNodes).collect( function(node) { return $A($PR(element).childNodes).collect( function(node) {
return (node.nodeType==3 ? node.nodeValue : return (node.nodeType==3 ? node.nodeValue :
(node.hasChildNodes() ? Element.collectTextNodes(node) : '')); (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
}).flatten().join(''); }).flatten().join('');
} }
Element.collectTextNodesIgnoreClass = function(element, className) { Element.collectTextNodesIgnoreClass = function(element, className) {
return $A($(element).childNodes).collect( function(node) { return $A($PR(element).childNodes).collect( function(node) {
return (node.nodeType==3 ? node.nodeValue : return (node.nodeType==3 ? node.nodeValue :
((node.hasChildNodes() && !Element.hasClassName(node,className)) ? ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
Element.collectTextNodesIgnoreClass(node, className) : '')); Element.collectTextNodesIgnoreClass(node, className) : ''));
@ -40,7 +40,7 @@ Element.collectTextNodesIgnoreClass = function(element, className) {
} }
Element.setContentZoom = function(element, percent) { Element.setContentZoom = function(element, percent) {
element = $(element); element = $PR(element);
Element.setStyle(element, {fontSize: (percent/100) + 'em'}); Element.setStyle(element, {fontSize: (percent/100) + 'em'});
if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
} }
@ -55,7 +55,7 @@ Element.getOpacity = function(element){
} }
Element.setOpacity = function(element, value){ Element.setOpacity = function(element, value){
element= $(element); element= $PR(element);
if (value == 1){ if (value == 1){
Element.setStyle(element, { opacity: Element.setStyle(element, { opacity:
(/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ?
@ -73,12 +73,12 @@ Element.setOpacity = function(element, value){
} }
Element.getInlineOpacity = function(element){ Element.getInlineOpacity = function(element){
return $(element).style.opacity || ''; return $PR(element).style.opacity || '';
} }
Element.childrenWithClassName = function(element, className, findFirst) { Element.childrenWithClassName = function(element, className, findFirst) {
var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)"); var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)");
var results = $A($(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { var results = $A($PR(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) {
return (c.className && c.className.match(classNameRegExp)); return (c.className && c.className.match(classNameRegExp));
}); });
if(!results) results = []; if(!results) results = [];
@ -87,7 +87,7 @@ Element.childrenWithClassName = function(element, className, findFirst) {
Element.forceRerendering = function(element) { Element.forceRerendering = function(element) {
try { try {
element = $(element); element = $PR(element);
var n = document.createTextNode(' '); var n = document.createTextNode(' ');
element.appendChild(n); element.appendChild(n);
element.removeChild(n); element.removeChild(n);
@ -107,7 +107,7 @@ var Effect = {
tagifyText: function(element) { tagifyText: function(element) {
var tagifyStyle = 'position:relative'; var tagifyStyle = 'position:relative';
if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1'; if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
element = $(element); element = $PR(element);
$A(element.childNodes).each( function(child) { $A(element.childNodes).each( function(child) {
if(child.nodeType==3) { if(child.nodeType==3) {
child.nodeValue.toArray().each( function(character) { child.nodeValue.toArray().each( function(character) {
@ -127,7 +127,7 @@ var Effect = {
(element.length)) (element.length))
elements = element; elements = element;
else else
elements = $(element).childNodes; elements = $PR(element).childNodes;
var options = Object.extend({ var options = Object.extend({
speed: 0.1, speed: 0.1,
@ -145,7 +145,7 @@ var Effect = {
'appear': ['Appear','Fade'] 'appear': ['Appear','Fade']
}, },
toggle: function(element, effect) { toggle: function(element, effect) {
element = $(element); element = $PR(element);
effect = (effect || 'appear').toLowerCase(); effect = (effect || 'appear').toLowerCase();
var options = Object.extend({ var options = Object.extend({
queue: { position:'end', scope:(element.id || 'global'), limit: 1 } queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
@ -351,7 +351,7 @@ Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
Effect.Opacity = Class.create(); Effect.Opacity = Class.create();
Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), { Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
initialize: function(element) { initialize: function(element) {
this.element = $(element); this.element = $PR(element);
// make this work on IE on elements without 'layout' // make this work on IE on elements without 'layout'
if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout)) if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
this.element.setStyle({zoom: 1}); this.element.setStyle({zoom: 1});
@ -369,7 +369,7 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
Effect.Move = Class.create(); Effect.Move = Class.create();
Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), { Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
initialize: function(element) { initialize: function(element) {
this.element = $(element); this.element = $PR(element);
var options = Object.extend({ var options = Object.extend({
x: 0, x: 0,
y: 0, y: 0,
@ -408,7 +408,7 @@ Effect.MoveBy = function(element, toTop, toLeft) {
Effect.Scale = Class.create(); Effect.Scale = Class.create();
Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), { Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
initialize: function(element, percent) { initialize: function(element, percent) {
this.element = $(element) this.element = $PR(element)
var options = Object.extend({ var options = Object.extend({
scaleX: true, scaleX: true,
scaleY: true, scaleY: true,
@ -482,7 +482,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
Effect.Highlight = Class.create(); Effect.Highlight = Class.create();
Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), { Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {
initialize: function(element) { initialize: function(element) {
this.element = $(element); this.element = $PR(element);
var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {}); var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
this.start(options); this.start(options);
}, },
@ -515,7 +515,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
Effect.ScrollTo = Class.create(); Effect.ScrollTo = Class.create();
Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), { Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
initialize: function(element) { initialize: function(element) {
this.element = $(element); this.element = $PR(element);
this.start(arguments[1] || {}); this.start(arguments[1] || {});
}, },
setup: function() { setup: function() {
@ -540,7 +540,7 @@ Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
/* ------------- combination effects ------------- */ /* ------------- combination effects ------------- */
Effect.Fade = function(element) { Effect.Fade = function(element) {
element = $(element); element = $PR(element);
var oldOpacity = element.getInlineOpacity(); var oldOpacity = element.getInlineOpacity();
var options = Object.extend({ var options = Object.extend({
from: element.getOpacity() || 1.0, from: element.getOpacity() || 1.0,
@ -554,7 +554,7 @@ Effect.Fade = function(element) {
} }
Effect.Appear = function(element) { Effect.Appear = function(element) {
element = $(element); element = $PR(element);
var options = Object.extend({ var options = Object.extend({
from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
to: 1.0, to: 1.0,
@ -570,7 +570,7 @@ Effect.Appear = function(element) {
} }
Effect.Puff = function(element) { Effect.Puff = function(element) {
element = $(element); element = $PR(element);
var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') }; var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') };
return new Effect.Parallel( return new Effect.Parallel(
[ new Effect.Scale(element, 200, [ new Effect.Scale(element, 200,
@ -587,7 +587,7 @@ Effect.Puff = function(element) {
} }
Effect.BlindUp = function(element) { Effect.BlindUp = function(element) {
element = $(element); element = $PR(element);
element.makeClipping(); element.makeClipping();
return new Effect.Scale(element, 0, return new Effect.Scale(element, 0,
Object.extend({ scaleContent: false, Object.extend({ scaleContent: false,
@ -602,7 +602,7 @@ Effect.BlindUp = function(element) {
} }
Effect.BlindDown = function(element) { Effect.BlindDown = function(element) {
element = $(element); element = $PR(element);
var elementDimensions = element.getDimensions(); var elementDimensions = element.getDimensions();
return new Effect.Scale(element, 100, return new Effect.Scale(element, 100,
Object.extend({ scaleContent: false, Object.extend({ scaleContent: false,
@ -623,7 +623,7 @@ Effect.BlindDown = function(element) {
} }
Effect.SwitchOff = function(element) { Effect.SwitchOff = function(element) {
element = $(element); element = $PR(element);
var oldOpacity = element.getInlineOpacity(); var oldOpacity = element.getInlineOpacity();
return new Effect.Appear(element, { return new Effect.Appear(element, {
duration: 0.4, duration: 0.4,
@ -649,7 +649,7 @@ Effect.SwitchOff = function(element) {
} }
Effect.DropOut = function(element) { Effect.DropOut = function(element) {
element = $(element); element = $PR(element);
var oldStyle = { var oldStyle = {
top: element.getStyle('top'), top: element.getStyle('top'),
left: element.getStyle('left'), left: element.getStyle('left'),
@ -671,7 +671,7 @@ Effect.DropOut = function(element) {
} }
Effect.Shake = function(element) { Effect.Shake = function(element) {
element = $(element); element = $PR(element);
var oldStyle = { var oldStyle = {
top: element.getStyle('top'), top: element.getStyle('top'),
left: element.getStyle('left') }; left: element.getStyle('left') };
@ -693,10 +693,10 @@ Effect.Shake = function(element) {
} }
Effect.SlideDown = function(element) { Effect.SlideDown = function(element) {
element = $(element); element = $PR(element);
element.cleanWhitespace(); element.cleanWhitespace();
// SlideDown need to have the content of the element wrapped in a container element with fixed height! // SlideDown need to have the content of the element wrapped in a container element with fixed height!
var oldInnerBottom = $(element.firstChild).getStyle('bottom'); var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
var elementDimensions = element.getDimensions(); var elementDimensions = element.getDimensions();
return new Effect.Scale(element, 100, Object.extend({ return new Effect.Scale(element, 100, Object.extend({
scaleContent: false, scaleContent: false,
@ -731,9 +731,9 @@ Effect.SlideDown = function(element) {
} }
Effect.SlideUp = function(element) { Effect.SlideUp = function(element) {
element = $(element); element = $PR(element);
element.cleanWhitespace(); element.cleanWhitespace();
var oldInnerBottom = $(element.firstChild).getStyle('bottom'); var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
return new Effect.Scale(element, window.opera ? 0 : 1, return new Effect.Scale(element, window.opera ? 0 : 1,
Object.extend({ scaleContent: false, Object.extend({ scaleContent: false,
scaleX: false, scaleX: false,
@ -772,7 +772,7 @@ Effect.Squish = function(element) {
} }
Effect.Grow = function(element) { Effect.Grow = function(element) {
element = $(element); element = $PR(element);
var options = Object.extend({ var options = Object.extend({
direction: 'center', direction: 'center',
moveTransition: Effect.Transitions.sinoidal, moveTransition: Effect.Transitions.sinoidal,
@ -851,7 +851,7 @@ Effect.Grow = function(element) {
} }
Effect.Shrink = function(element) { Effect.Shrink = function(element) {
element = $(element); element = $PR(element);
var options = Object.extend({ var options = Object.extend({
direction: 'center', direction: 'center',
moveTransition: Effect.Transitions.sinoidal, moveTransition: Effect.Transitions.sinoidal,
@ -908,7 +908,7 @@ Effect.Shrink = function(element) {
} }
Effect.Pulsate = function(element) { Effect.Pulsate = function(element) {
element = $(element); element = $PR(element);
var options = arguments[1] || {}; var options = arguments[1] || {};
var oldOpacity = element.getInlineOpacity(); var oldOpacity = element.getInlineOpacity();
var transition = options.transition || Effect.Transitions.sinoidal; var transition = options.transition || Effect.Transitions.sinoidal;
@ -921,7 +921,7 @@ Effect.Pulsate = function(element) {
} }
Effect.Fold = function(element) { Effect.Fold = function(element) {
element = $(element); element = $PR(element);
var oldStyle = { var oldStyle = {
top: element.style.top, top: element.style.top,
left: element.style.left, left: element.style.left,
@ -952,7 +952,7 @@ Element.Methods.visualEffect = function(element, effect, options) {
s = effect.gsub(/_/, '-').camelize(); s = effect.gsub(/_/, '-').camelize();
effect_class = s.charAt(0).toUpperCase() + s.substring(1); effect_class = s.charAt(0).toUpperCase() + s.substring(1);
new Effect[effect_class](element, options); new Effect[effect_class](element, options);
return $(element); return $PR(element);
}; };
Element.addMethods(); Element.addMethods();

View file

@ -784,9 +784,9 @@ Ajax.Updater = Class.create();
Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
initialize: function(container, url, options) { initialize: function(container, url, options) {
this.containers = { this.containers = {
success: container.success ? $(container.success) : $(container), success: container.success ? $PR(container.success) : $PR(container),
failure: container.failure ? $(container.failure) : failure: container.failure ? $PR(container.failure) :
(container.success ? null : $(container)) (container.success ? null : $PR(container))
} }
this.transport = Ajax.getTransport(); this.transport = Ajax.getTransport();
@ -866,7 +866,7 @@ Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
this.updater = new Ajax.Updater(this.container, this.url, this.options); this.updater = new Ajax.Updater(this.container, this.url, this.options);
} }
}); });
function $() { function $PR() {
var results = [], element; var results = [], element;
for (var i = 0; i < arguments.length; i++) { for (var i = 0; i < arguments.length; i++) {
element = arguments[i]; element = arguments[i];
@ -878,7 +878,7 @@ function $() {
} }
document.getElementsByClassName = function(className, parentElement) { document.getElementsByClassName = function(className, parentElement) {
var children = ($(parentElement) || document.body).getElementsByTagName('*'); var children = ($PR(parentElement) || document.body).getElementsByTagName('*');
return $A(children).inject([], function(elements, child) { return $A(children).inject([], function(elements, child) {
if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
elements.push(Element.extend(child)); elements.push(Element.extend(child));
@ -918,42 +918,42 @@ Element.extend.cache = {
Element.Methods = { Element.Methods = {
visible: function(element) { visible: function(element) {
return $(element).style.display != 'none'; return $PR(element).style.display != 'none';
}, },
toggle: function() { toggle: function() {
for (var i = 0; i < arguments.length; i++) { for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]); var element = $PR(arguments[i]);
Element[Element.visible(element) ? 'hide' : 'show'](element); Element[Element.visible(element) ? 'hide' : 'show'](element);
} }
}, },
hide: function() { hide: function() {
for (var i = 0; i < arguments.length; i++) { for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]); var element = $PR(arguments[i]);
element.style.display = 'none'; element.style.display = 'none';
} }
}, },
show: function() { show: function() {
for (var i = 0; i < arguments.length; i++) { for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]); var element = $PR(arguments[i]);
element.style.display = ''; element.style.display = '';
} }
}, },
remove: function(element) { remove: function(element) {
element = $(element); element = $PR(element);
element.parentNode.removeChild(element); element.parentNode.removeChild(element);
}, },
update: function(element, html) { update: function(element, html) {
$(element).innerHTML = html.stripScripts(); $PR(element).innerHTML = html.stripScripts();
setTimeout(function() {html.evalScripts()}, 10); setTimeout(function() {html.evalScripts()}, 10);
}, },
replace: function(element, html) { replace: function(element, html) {
element = $(element); element = $PR(element);
if (element.outerHTML) { if (element.outerHTML) {
element.outerHTML = html.stripScripts(); element.outerHTML = html.stripScripts();
} else { } else {
@ -966,7 +966,7 @@ Element.Methods = {
}, },
getHeight: function(element) { getHeight: function(element) {
element = $(element); element = $PR(element);
return element.offsetHeight; return element.offsetHeight;
}, },
@ -975,23 +975,23 @@ Element.Methods = {
}, },
hasClassName: function(element, className) { hasClassName: function(element, className) {
if (!(element = $(element))) return; if (!(element = $PR(element))) return;
return Element.classNames(element).include(className); return Element.classNames(element).include(className);
}, },
addClassName: function(element, className) { addClassName: function(element, className) {
if (!(element = $(element))) return; if (!(element = $PR(element))) return;
return Element.classNames(element).add(className); return Element.classNames(element).add(className);
}, },
removeClassName: function(element, className) { removeClassName: function(element, className) {
if (!(element = $(element))) return; if (!(element = $PR(element))) return;
return Element.classNames(element).remove(className); return Element.classNames(element).remove(className);
}, },
// removes whitespace-only text node children // removes whitespace-only text node children
cleanWhitespace: function(element) { cleanWhitespace: function(element) {
element = $(element); element = $PR(element);
for (var i = 0; i < element.childNodes.length; i++) { for (var i = 0; i < element.childNodes.length; i++) {
var node = element.childNodes[i]; var node = element.childNodes[i];
if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
@ -1000,25 +1000,25 @@ Element.Methods = {
}, },
empty: function(element) { empty: function(element) {
return $(element).innerHTML.match(/^\s*$/); return $PR(element).innerHTML.match(/^\s*$/);
}, },
childOf: function(element, ancestor) { childOf: function(element, ancestor) {
element = $(element), ancestor = $(ancestor); element = $PR(element), ancestor = $PR(ancestor);
while (element = element.parentNode) while (element = element.parentNode)
if (element == ancestor) return true; if (element == ancestor) return true;
return false; return false;
}, },
scrollTo: function(element) { scrollTo: function(element) {
element = $(element); element = $PR(element);
var x = element.x ? element.x : element.offsetLeft, var x = element.x ? element.x : element.offsetLeft,
y = element.y ? element.y : element.offsetTop; y = element.y ? element.y : element.offsetTop;
window.scrollTo(x, y); window.scrollTo(x, y);
}, },
getStyle: function(element, style) { getStyle: function(element, style) {
element = $(element); element = $PR(element);
var value = element.style[style.camelize()]; var value = element.style[style.camelize()];
if (!value) { if (!value) {
if (document.defaultView && document.defaultView.getComputedStyle) { if (document.defaultView && document.defaultView.getComputedStyle) {
@ -1036,13 +1036,13 @@ Element.Methods = {
}, },
setStyle: function(element, style) { setStyle: function(element, style) {
element = $(element); element = $PR(element);
for (var name in style) for (var name in style)
element.style[name.camelize()] = style[name]; element.style[name.camelize()] = style[name];
}, },
getDimensions: function(element) { getDimensions: function(element) {
element = $(element); element = $PR(element);
if (Element.getStyle(element, 'display') != 'none') if (Element.getStyle(element, 'display') != 'none')
return {width: element.offsetWidth, height: element.offsetHeight}; return {width: element.offsetWidth, height: element.offsetHeight};
@ -1063,7 +1063,7 @@ Element.Methods = {
}, },
makePositioned: function(element) { makePositioned: function(element) {
element = $(element); element = $PR(element);
var pos = Element.getStyle(element, 'position'); var pos = Element.getStyle(element, 'position');
if (pos == 'static' || !pos) { if (pos == 'static' || !pos) {
element._madePositioned = true; element._madePositioned = true;
@ -1078,7 +1078,7 @@ Element.Methods = {
}, },
undoPositioned: function(element) { undoPositioned: function(element) {
element = $(element); element = $PR(element);
if (element._madePositioned) { if (element._madePositioned) {
element._madePositioned = undefined; element._madePositioned = undefined;
element.style.position = element.style.position =
@ -1090,7 +1090,7 @@ Element.Methods = {
}, },
makeClipping: function(element) { makeClipping: function(element) {
element = $(element); element = $PR(element);
if (element._overflow) return; if (element._overflow) return;
element._overflow = element.style.overflow; element._overflow = element.style.overflow;
if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
@ -1098,7 +1098,7 @@ Element.Methods = {
}, },
undoClipping: function(element) { undoClipping: function(element) {
element = $(element); element = $PR(element);
if (element._overflow) return; if (element._overflow) return;
element.style.overflow = element._overflow; element.style.overflow = element._overflow;
element._overflow = undefined; element._overflow = undefined;
@ -1141,7 +1141,7 @@ Abstract.Insertion = function(adjacency) {
Abstract.Insertion.prototype = { Abstract.Insertion.prototype = {
initialize: function(element, content) { initialize: function(element, content) {
this.element = $(element); this.element = $PR(element);
this.content = content.stripScripts(); this.content = content.stripScripts();
if (this.adjacency && this.element.insertAdjacentHTML) { if (this.adjacency && this.element.insertAdjacentHTML) {
@ -1233,7 +1233,7 @@ Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
Element.ClassNames = Class.create(); Element.ClassNames = Class.create();
Element.ClassNames.prototype = { Element.ClassNames.prototype = {
initialize: function(element) { initialize: function(element) {
this.element = $(element); this.element = $PR(element);
}, },
_each: function(iterator) { _each: function(iterator) {
@ -1346,7 +1346,7 @@ Selector.prototype = {
findElements: function(scope) { findElements: function(scope) {
var element; var element;
if (element = $(this.params.id)) if (element = $PR(this.params.id))
if (this.match(element)) if (this.match(element))
if (!scope || Element.childOf(element, scope)) if (!scope || Element.childOf(element, scope))
return [element]; return [element];
@ -1377,25 +1377,25 @@ function $$() {
var Field = { var Field = {
clear: function() { clear: function() {
for (var i = 0; i < arguments.length; i++) for (var i = 0; i < arguments.length; i++)
$(arguments[i]).value = ''; $PR(arguments[i]).value = '';
}, },
focus: function(element) { focus: function(element) {
$(element).focus(); $PR(element).focus();
}, },
present: function() { present: function() {
for (var i = 0; i < arguments.length; i++) for (var i = 0; i < arguments.length; i++)
if ($(arguments[i]).value == '') return false; if ($PR(arguments[i]).value == '') return false;
return true; return true;
}, },
select: function(element) { select: function(element) {
$(element).select(); $PR(element).select();
}, },
activate: function(element) { activate: function(element) {
element = $(element); element = $PR(element);
element.focus(); element.focus();
if (element.select) if (element.select)
element.select(); element.select();
@ -1406,7 +1406,7 @@ var Field = {
var Form = { var Form = {
serialize: function(form) { serialize: function(form) {
var elements = Form.getElements($(form)); var elements = Form.getElements($PR(form));
var queryComponents = new Array(); var queryComponents = new Array();
for (var i = 0; i < elements.length; i++) { for (var i = 0; i < elements.length; i++) {
@ -1419,7 +1419,7 @@ var Form = {
}, },
getElements: function(form) { getElements: function(form) {
form = $(form); form = $PR(form);
var elements = new Array(); var elements = new Array();
for (var tagName in Form.Element.Serializers) { for (var tagName in Form.Element.Serializers) {
@ -1431,7 +1431,7 @@ var Form = {
}, },
getInputs: function(form, typeName, name) { getInputs: function(form, typeName, name) {
form = $(form); form = $PR(form);
var inputs = form.getElementsByTagName('input'); var inputs = form.getElementsByTagName('input');
if (!typeName && !name) if (!typeName && !name)
@ -1478,13 +1478,13 @@ var Form = {
}, },
reset: function(form) { reset: function(form) {
$(form).reset(); $PR(form).reset();
} }
} }
Form.Element = { Form.Element = {
serialize: function(element) { serialize: function(element) {
element = $(element); element = $PR(element);
var method = element.tagName.toLowerCase(); var method = element.tagName.toLowerCase();
var parameter = Form.Element.Serializers[method](element); var parameter = Form.Element.Serializers[method](element);
@ -1502,7 +1502,7 @@ Form.Element = {
}, },
getValue: function(element) { getValue: function(element) {
element = $(element); element = $PR(element);
var method = element.tagName.toLowerCase(); var method = element.tagName.toLowerCase();
var parameter = Form.Element.Serializers[method](element); var parameter = Form.Element.Serializers[method](element);
@ -1570,7 +1570,7 @@ Abstract.TimedObserver = function() {}
Abstract.TimedObserver.prototype = { Abstract.TimedObserver.prototype = {
initialize: function(element, frequency, callback) { initialize: function(element, frequency, callback) {
this.frequency = frequency; this.frequency = frequency;
this.element = $(element); this.element = $PR(element);
this.callback = callback; this.callback = callback;
this.lastValue = this.getValue(); this.lastValue = this.getValue();
@ -1609,7 +1609,7 @@ Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
Abstract.EventObserver = function() {} Abstract.EventObserver = function() {}
Abstract.EventObserver.prototype = { Abstract.EventObserver.prototype = {
initialize: function(element, callback) { initialize: function(element, callback) {
this.element = $(element); this.element = $PR(element);
this.callback = callback; this.callback = callback;
this.lastValue = this.getValue(); this.lastValue = this.getValue();
@ -1742,7 +1742,7 @@ Object.extend(Event, {
}, },
observe: function(element, name, observer, useCapture) { observe: function(element, name, observer, useCapture) {
var element = $(element); var element = $PR(element);
useCapture = useCapture || false; useCapture = useCapture || false;
if (name == 'keypress' && if (name == 'keypress' &&
@ -1754,7 +1754,7 @@ Object.extend(Event, {
}, },
stopObserving: function(element, name, observer, useCapture) { stopObserving: function(element, name, observer, useCapture) {
var element = $(element); var element = $PR(element);
useCapture = useCapture || false; useCapture = useCapture || false;
if (name == 'keypress' && if (name == 'keypress' &&
@ -1876,8 +1876,8 @@ var Position = {
}, },
clone: function(source, target) { clone: function(source, target) {
source = $(source); source = $PR(source);
target = $(target); target = $PR(target);
target.style.position = 'absolute'; target.style.position = 'absolute';
var offsets = this.cumulativeOffset(source); var offsets = this.cumulativeOffset(source);
target.style.top = offsets[1] + 'px'; target.style.top = offsets[1] + 'px';
@ -1920,11 +1920,11 @@ var Position = {
}, arguments[2] || {}) }, arguments[2] || {})
// find page position of source // find page position of source
source = $(source); source = $PR(source);
var p = Position.page(source); var p = Position.page(source);
// find coordinate system to use // find coordinate system to use
target = $(target); target = $PR(target);
var delta = [0, 0]; var delta = [0, 0];
var parent = null; var parent = null;
// delta [0,0] will do fine with position: fixed elements, // delta [0,0] will do fine with position: fixed elements,
@ -1948,7 +1948,7 @@ var Position = {
}, },
absolutize: function(element) { absolutize: function(element) {
element = $(element); element = $PR(element);
if (element.style.position == 'absolute') return; if (element.style.position == 'absolute') return;
Position.prepare(); Position.prepare();
@ -1971,7 +1971,7 @@ var Position = {
}, },
relativize: function(element) { relativize: function(element) {
element = $(element); element = $PR(element);
if (element.style.position == 'relative') return; if (element.style.position == 'relative') return;
Position.prepare(); Position.prepare();
@ -2003,4 +2003,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
return [valueL, valueT]; return [valueL, valueT];
} }
} }

View file

@ -35,12 +35,12 @@ Control.Slider.prototype = {
var slider = this; var slider = this;
if(handle instanceof Array) { if(handle instanceof Array) {
this.handles = handle.collect( function(e) { return $(e) }); this.handles = handle.collect( function(e) { return $PR(e) });
} else { } else {
this.handles = [$(handle)]; this.handles = [$PR(handle)];
} }
this.track = $(track); this.track = $PR(track);
this.options = options || {}; this.options = options || {};
this.axis = this.options.axis || 'horizontal'; this.axis = this.options.axis || 'horizontal';
@ -50,9 +50,9 @@ Control.Slider.prototype = {
this.value = 0; // assure backwards compat this.value = 0; // assure backwards compat
this.values = this.handles.map( function() { return 0 }); this.values = this.handles.map( function() { return 0 });
this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false; this.spans = this.options.spans ? this.options.spans.map(function(s){ return $PR(s) }) : false;
this.options.startSpan = $(this.options.startSpan || null); this.options.startSpan = $PR(this.options.startSpan || null);
this.options.endSpan = $(this.options.endSpan || null); this.options.endSpan = $PR(this.options.endSpan || null);
this.restricted = this.options.restricted || false; this.restricted = this.options.restricted || false;
@ -280,4 +280,4 @@ Control.Slider.prototype = {
this.options.onChange(this.values.length>1 ? this.values : this.value, this); this.options.onChange(this.values.length>1 ? this.values : this.value, this);
this.event = null; this.event = null;
} }
} }

View file

@ -32,7 +32,7 @@ Event.simulateMouse = function(element, eventName) {
var oEvent = document.createEvent("MouseEvents"); var oEvent = document.createEvent("MouseEvents");
oEvent.initMouseEvent(eventName, true, true, document.defaultView, oEvent.initMouseEvent(eventName, true, true, document.defaultView,
options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY,
false, false, false, false, 0, $(element)); false, false, false, false, 0, $PR(element));
if(this.mark) Element.remove(this.mark); if(this.mark) Element.remove(this.mark);
this.mark = document.createElement('div'); this.mark = document.createElement('div');
@ -49,7 +49,7 @@ Event.simulateMouse = function(element, eventName) {
if(this.step) if(this.step)
alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
$(element).dispatchEvent(oEvent); $PR(element).dispatchEvent(oEvent);
}; };
// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2. // Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
@ -69,7 +69,7 @@ Event.simulateKey = function(element, eventName) {
oEvent.initKeyEvent(eventName, true, true, window, oEvent.initKeyEvent(eventName, true, true, window,
options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
options.keyCode, options.charCode ); options.keyCode, options.charCode );
$(element).dispatchEvent(oEvent); $PR(element).dispatchEvent(oEvent);
}; };
Event.simulateKeys = function(element, command) { Event.simulateKeys = function(element, command) {
@ -87,7 +87,7 @@ Test.Unit.inspect = Object.inspect;
Test.Unit.Logger = Class.create(); Test.Unit.Logger = Class.create();
Test.Unit.Logger.prototype = { Test.Unit.Logger.prototype = {
initialize: function(log) { initialize: function(log) {
this.log = $(log); this.log = $PR(log);
if (this.log) { if (this.log) {
this._createLogTable(); this._createLogTable();
} }
@ -126,8 +126,8 @@ Test.Unit.Logger.prototype = {
'<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' + '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
'<tbody id="loglines"></tbody>' + '<tbody id="loglines"></tbody>' +
'</table>'; '</table>';
this.logsummary = $('logsummary') this.logsummary = $PR('logsummary')
this.loglines = $('loglines'); this.loglines = $PR('loglines');
}, },
_toHTML: function(txt) { _toHTML: function(txt) {
return txt.escapeHTML().replace(/\n/g,"<br/>"); return txt.escapeHTML().replace(/\n/g,"<br/>");
@ -142,7 +142,7 @@ Test.Unit.Runner.prototype = {
}, arguments[1] || {}); }, arguments[1] || {});
this.options.resultsURL = this.parseResultsURLQueryParameter(); this.options.resultsURL = this.parseResultsURLQueryParameter();
if (this.options.testLog) { if (this.options.testLog) {
this.options.testLog = $(this.options.testLog) || null; this.options.testLog = $PR(this.options.testLog) || null;
} }
if(this.options.tests) { if(this.options.tests) {
this.tests = []; this.tests = [];
@ -326,7 +326,7 @@ Test.Unit.Assertions.prototype = {
catch(e) { this.error(e); } catch(e) { this.error(e); }
}, },
_isVisible: function(element) { _isVisible: function(element) {
element = $(element); element = $PR(element);
if(!element.parentNode) return true; if(!element.parentNode) return true;
this.assertNotNull(element); this.assertNotNull(element);
if(element.style && Element.getStyle(element, 'display') == 'none') if(element.style && Element.getStyle(element, 'display') == 'none')

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// basic example // basic example

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// Absolute positioned example // Absolute positioned example

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// float example // float example
@ -30,12 +30,12 @@
'testFloatImage', 'testFloatImage',
{ {
onEndCrop: function( coords, dimensions ) { onEndCrop: function( coords, dimensions ) {
$( 'floatX1' ).value = coords.x1; $PR( 'floatX1' ).value = coords.x1;
$( 'floatY1' ).value = coords.y1; $PR( 'floatY1' ).value = coords.y1;
$( 'floatX2' ).value = coords.x2; $PR( 'floatX2' ).value = coords.x2;
$( 'floatY2' ).value = coords.y2; $PR( 'floatY2' ).value = coords.y2;
$( 'floatWidth' ).value = dimensions.width; $PR( 'floatWidth' ).value = dimensions.width;
$( 'floatHeight' ).value = dimensions.height; $PR( 'floatHeight' ).value = dimensions.height;
} }
} }
); );

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// relative example // relative example

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// basic example // basic example

View file

@ -13,12 +13,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// basic example // basic example

View file

@ -12,12 +12,12 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
/* /*

View file

@ -55,9 +55,9 @@
* @return void * @return void
*/ */
setImage: function( imgSrc, w, h ) { setImage: function( imgSrc, w, h ) {
$( 'testImage' ).src = imgSrc; $PR( 'testImage' ).src = imgSrc;
$( 'testImage' ).width = w; $PR( 'testImage' ).width = w;
$( 'testImage' ).height = h; $PR( 'testImage' ).height = h;
this.attachCropper(); this.attachCropper();
}, },
@ -98,12 +98,12 @@
// setup the callback function // setup the callback function
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// basic example // basic example
@ -112,9 +112,9 @@
'load', 'load',
function() { function() {
CropImageManager.init(); CropImageManager.init();
Event.observe( $('removeCropper'), 'click', CropImageManager.removeCropper.bindAsEventListener( CropImageManager ), false ); Event.observe( $PR('removeCropper'), 'click', CropImageManager.removeCropper.bindAsEventListener( CropImageManager ), false );
Event.observe( $('resetCropper'), 'click', CropImageManager.resetCropper.bindAsEventListener( CropImageManager ), false ); Event.observe( $PR('resetCropper'), 'click', CropImageManager.resetCropper.bindAsEventListener( CropImageManager ), false );
Event.observe( $('imageChoice'), 'change', CropImageManager.onChange.bindAsEventListener( CropImageManager ), false ); Event.observe( $PR('imageChoice'), 'change', CropImageManager.onChange.bindAsEventListener( CropImageManager ), false );
} }
); );
@ -168,7 +168,7 @@
<p> <p>
<input type="button" id="removeCropper" value="Remove Cropper" /> <input type="button" id="removeCropper" value="Remove Cropper" />
<input type="button" id="resetCropper" value="Reset Cropper" /> <input type="button" id="resetCropper" value="Reset Cropper" />
</p> </p>

View file

@ -12,12 +12,12 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// with a supplied ratio // with a supplied ratio

View file

@ -12,12 +12,12 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// example with minimum dimensions // example with minimum dimensions

View file

@ -12,12 +12,12 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// example with minimum dimensions // example with minimum dimensions

View file

@ -12,12 +12,12 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
// example with a preview of crop results, must have minimumm dimensions // example with a preview of crop results, must have minimumm dimensions

View file

@ -13,12 +13,10 @@ JSFILES=(
"js/main.js" "js/main.js"
"js/webtoolkit.base64.js" "js/webtoolkit.base64.js"
"view/theme/frost/js/acl.js" "view/theme/frost/js/acl.js"
"view/theme/frost/js/fk.autocomplete.js"
"view/theme/frost/js/jquery.divgrow-1.3.1.f1.js" "view/theme/frost/js/jquery.divgrow-1.3.1.f1.js"
"view/theme/frost/js/main.js" "view/theme/frost/js/main.js"
"view/theme/frost/js/theme.js" "view/theme/frost/js/theme.js"
"view/theme/frost-mobile/js/acl.js" "view/theme/frost-mobile/js/acl.js"
"view/theme/frost-mobile/js/fk.autocomplete.js"
"view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js" "view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js"
"view/theme/frost-mobile/js/main.js" "view/theme/frost-mobile/js/main.js"
"view/theme/frost-mobile/js/theme.js" "view/theme/frost-mobile/js/theme.js"

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p id="cropimage-desc"> <p id="cropimage-desc">
{{$desc}} {{$desc}}
@ -17,12 +12,12 @@
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
Event.observe( window, 'load', function() { Event.observe( window, 'load', function() {

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
<script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field combobox'> <div class='field combobox'>
<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>

View file

@ -1,10 +1,5 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input'> <div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
<span class='field_help'>{{$field.3}}</span> <span class='field_help'>{{$field.3}}</span>

View file

@ -1,10 +1,5 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input openid'> <div class='field input openid' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
<span class='field_help'>{{$field.3}}</span> <span class='field_help'>{{$field.3}}</span>

View file

@ -1,10 +1,5 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field password'> <div class='field password' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
<span class='field_help'>{{$field.3}}</span> <span class='field_help'>{{$field.3}}</span>

View file

@ -1,5 +0,0 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div id="datebrowse-sidebar" class="widget"> <div id="datebrowse-sidebar" class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>

View file

@ -23,11 +23,11 @@ document.addEventListener('DOMContentLoaded', function(){
window.imageUploadButton, window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname, { action: 'wall_upload/'+window.nickname,
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
var currentText = $j(window.jotId).val(); var currentText = $(window.jotId).val();
$j(window.jotId).val(currentText + response); $(window.jotId).val(currentText + response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );
@ -37,11 +37,11 @@ document.addEventListener('DOMContentLoaded', function(){
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/'+window.nickname, { action: 'wall_attach/'+window.nickname,
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
var currentText = $j(window.jotId).val(); var currentText = $(window.jotId).val();
$j(window.jotId).val(currentText + response); $(window.jotId).val(currentText + response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );

View file

@ -1 +1 @@
document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){} document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){}

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script> <script>
function confirm_delete(uname){ function confirm_delete(uname){
return confirm( "{{$confirm_delete}}".format(uname)); return confirm( "{{$confirm_delete}}".format(uname));
@ -11,7 +6,7 @@
return confirm("{{$confirm_delete_multi}}"); return confirm("{{$confirm_delete_multi}}");
} }
{{*/*function selectall(cls){ {{*/*function selectall(cls){
$j("."+cls).attr('checked','checked'); $("."+cls).attr('checked','checked');
return false; return false;
}*/*}} }*/*}}
</script> </script>

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p id="cropimage-desc"> <p id="cropimage-desc">
{{$desc}} {{$desc}}

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
{{*<!-- <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> {{*<!-- <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
<script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

View file

@ -1,6 +1 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" /> <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

View file

@ -11,7 +11,6 @@
tinyMCE.init({ mode : "none"}); tinyMCE.init({ mode : "none"});
</script>-->*}} </script>-->*}}
{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script> {{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}} <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
@ -25,6 +24,5 @@
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script> <!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>--> <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input' id='wrapper_{{$field.0}}'> <div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label><br /> <label for='id_{{$field.0}}'>{{$field.1}}</label><br />

View file

@ -1,16 +1,11 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
if(navigator.geolocation) { if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) { navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4); var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4); var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon); $('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show(); $('#profile-nolocation-wrapper').show();
}); });
} }

View file

@ -1,7 +1,2 @@
{{* <script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>

View file

@ -28,6 +28,6 @@ function decaf_mobile_content_loaded(&$a) {
$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css'; $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css';
} }
if( $a->module === 'login' ) if( $a->module === 'login' )
$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>'; $a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
} }

View file

@ -13,41 +13,41 @@ function ACL(backend_url, preset){
that.group_uids = []; that.group_uids = [];
that.nw = 2; //items per row. should be calulated from #acl-list.width that.nw = 2; //items per row. should be calulated from #acl-list.width
that.list_content = $j("#acl-list-content"); that.list_content = $("#acl-list-content");
that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html()); that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $j("#acl-showall"); that.showall = $("#acl-showall");
if (preset.length==0) that.showall.addClass("selected"); if (preset.length==0) that.showall.addClass("selected");
/*events*/ /*events*/
that.showall.click(that.on_showall); that.showall.click(that.on_showall);
$j(".acl-button-show").live('click', that.on_button_show); $(".acl-button-show").live('click', that.on_button_show);
$j(".acl-button-hide").live('click', that.on_button_hide); $(".acl-button-hide").live('click', that.on_button_hide);
$j("#acl-search").keypress(that.on_search); $("#acl-search").keypress(that.on_search);
$j("#acl-wrapper").parents("form").submit(that.on_submit); $("#acl-wrapper").parents("form").submit(that.on_submit);
/* startup! */ /* startup! */
that.get(0,100); that.get(0,100);
} }
ACL.prototype.on_submit = function(){ ACL.prototype.on_submit = function(){
aclfileds = $j("#acl-fields").html(""); aclfileds = $("#acl-fields").html("");
$j(that.allow_gid).each(function(i,v){ $(that.allow_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
}); });
$j(that.allow_cid).each(function(i,v){ $(that.allow_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
}); });
$j(that.deny_gid).each(function(i,v){ $(that.deny_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
}); });
$j(that.deny_cid).each(function(i,v){ $(that.deny_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
}); });
} }
ACL.prototype.search = function(){ ACL.prototype.search = function(){
var srcstr = $j("#acl-search").val(); var srcstr = $("#acl-search").val();
that.list_content.html(""); that.list_content.html("");
that.get(0,100, srcstr); that.get(0,100, srcstr);
} }
@ -82,10 +82,10 @@ ACL.prototype.on_button_show = function(event){
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*that.showall.removeClass("selected");
$j(this).siblings(".acl-button-hide").removeClass("selected"); $(this).siblings(".acl-button-hide").removeClass("selected");
$j(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_allow($j(this).parent().attr('id')); that.set_allow($(this).parent().attr('id'));
return false; return false;
} }
@ -95,10 +95,10 @@ ACL.prototype.on_button_hide = function(event){
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*that.showall.removeClass("selected");
$j(this).siblings(".acl-button-show").removeClass("selected"); $(this).siblings(".acl-button-show").removeClass("selected");
$j(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_deny($j(this).parent().attr('id')); that.set_deny($(this).parent().attr('id'));
return false; return false;
} }
@ -156,32 +156,32 @@ ACL.prototype.update_view = function(){
that.deny_gid.length==0 && that.deny_cid.length==0){ that.deny_gid.length==0 && that.deny_cid.length==0){
that.showall.addClass("selected"); that.showall.addClass("selected");
/* jot acl */ /* jot acl */
$j('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$j('#jot-public').show(); $('#jot-public').show();
$j('.profile-jot-net input').attr('disabled', false); $('.profile-jot-net input').attr('disabled', false);
if(typeof editor != 'undefined' && editor != false) { if(typeof editor != 'undefined' && editor != false) {
$j('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
} else { } else {
that.showall.removeClass("selected"); that.showall.removeClass("selected");
/* jot acl */ /* jot acl */
$j('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$j('#jot-public').hide(); $('#jot-public').hide();
$j('.profile-jot-net input').attr('disabled', 'disabled'); $('.profile-jot-net input').attr('disabled', 'disabled');
$j('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
$j("#acl-list-content .acl-list-item").each(function(){ $("#acl-list-content .acl-list-item").each(function(){
$j(this).removeClass("groupshow grouphide"); $(this).removeClass("groupshow grouphide");
}); });
$j("#acl-list-content .acl-list-item").each(function(){ $("#acl-list-content .acl-list-item").each(function(){
itemid = $j(this).attr('id'); itemid = $(this).attr('id');
type = itemid[0]; type = itemid[0];
id = parseInt(itemid.substr(1)); id = parseInt(itemid.substr(1));
btshow = $j(this).children(".acl-button-show").removeClass("selected"); btshow = $(this).children(".acl-button-show").removeClass("selected");
bthide = $j(this).children(".acl-button-hide").removeClass("selected"); bthide = $(this).children(".acl-button-hide").removeClass("selected");
switch(type){ switch(type){
case "g": case "g":
@ -197,16 +197,16 @@ ACL.prototype.update_view = function(){
uclass="grouphide"; uclass="grouphide";
} }
$j(that.group_uids[id]).each(function(i,v) { $(that.group_uids[id]).each(function(i,v) {
if(uclass == "grouphide") if(uclass == "grouphide")
$j("#c"+v).removeClass("groupshow"); $("#c"+v).removeClass("groupshow");
if(uclass != "") { if(uclass != "") {
var cls = $j("#c"+v).attr('class'); var cls = $("#c"+v).attr('class');
if( cls == undefined) if( cls == undefined)
return true; return true;
var hiding = cls.indexOf('grouphide'); var hiding = cls.indexOf('grouphide');
if(hiding == -1) if(hiding == -1)
$j("#c"+v).addClass(uclass); $("#c"+v).addClass(uclass);
} }
}); });
@ -234,7 +234,7 @@ ACL.prototype.get = function(start,count, search){
search:search, search:search,
} }
$j.ajax({ $.ajax({
type:'POST', type:'POST',
url: that.url, url: that.url,
data: postdata, data: postdata,
@ -246,16 +246,16 @@ ACL.prototype.get = function(start,count, search){
ACL.prototype.populate = function(data){ ACL.prototype.populate = function(data){
/* var height = Math.ceil(data.tot / that.nw) * 42; /* var height = Math.ceil(data.tot / that.nw) * 42;
that.list_content.height(height);*/ that.list_content.height(height);*/
$j(data.items).each(function(){ $(data.items).each(function(){
html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link ); html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
if (this.uids!=undefined) that.group_uids[this.id] = this.uids; if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); that.list_content.append(html);
}); });
$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){ $(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
$j(el).attr('src', $j(el).data("src")); $(el).attr('src', $(el).data("src"));
}); });
that.update_view(); that.update_view();
} }

File diff suppressed because one or more lines are too long

View file

@ -10,14 +10,14 @@
listID = listID.replace(/\./g, "\\."); listID = listID.replace(/\./g, "\\.");
listID = listID.replace(/@/g, "\\@"); listID = listID.replace(/@/g, "\\@");
if($j(listID).is(":visible")) { if($(listID).is(":visible")) {
$j(listID).hide(); $(listID).hide();
$j(listID+"-wrapper").show(); $(listID+"-wrapper").show();
alert($j(listID+"-wrapper").attr("id")); alert($(listID+"-wrapper").attr("id"));
} }
else { else {
$j(listID).show(); $(listID).show();
$j(listID+"-wrapper").hide(); $(listID+"-wrapper").hide();
} }
} }
@ -46,16 +46,16 @@
var last_popup_menu = null; var last_popup_menu = null;
var last_popup_button = null; var last_popup_button = null;
$j(function() { $(function() {
$j.ajaxSetup({cache: false}); $.ajaxSetup({cache: false});
msie = $j.browser.msie ; msie = $.browser.msie ;
collapseHeight(); collapseHeight();
/* setup tooltips *//* /* setup tooltips *//*
$j("a,.tt").each(function(){ $("a,.tt").each(function(){
var e = $j(this); var e = $(this);
var pos="bottom"; var pos="bottom";
if (e.hasClass("tttop")) pos="top"; if (e.hasClass("tttop")) pos="top";
if (e.hasClass("ttbottom")) pos="bottom"; if (e.hasClass("ttbottom")) pos="bottom";
@ -67,19 +67,19 @@
/* setup onoff widgets */ /* setup onoff widgets */
$j(".onoff input").each(function(){ $(".onoff input").each(function(){
val = $j(this).val(); val = $(this).val();
id = $j(this).attr("id"); id = $(this).attr("id");
$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
}); });
$j(".onoff > a").click(function(event){ $(".onoff > a").click(function(event){
event.preventDefault(); event.preventDefault();
var input = $j(this).siblings("input"); var input = $(this).siblings("input");
var val = 1-input.val(); var val = 1-input.val();
var id = input.attr("id"); var id = input.attr("id");
$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
$j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
input.val(val); input.val(val);
//console.log(id); //console.log(id);
}); });
@ -91,129 +91,129 @@
function close_last_popup_menu(e) { function close_last_popup_menu(e) {
if( last_popup_menu ) { if( last_popup_menu ) {
if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) { if( '#' + last_popup_menu.attr('id') !== $(e.target).attr('rel')) {
last_popup_menu.hide(); last_popup_menu.hide();
if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show(); if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $('.main-container').show();
last_popup_button.removeClass("selected"); last_popup_button.removeClass("selected");
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
} }
} }
} }
$j('img[rel^=#]').click(function(e){ $('img[rel^=#]').click(function(e){
close_last_popup_menu(e); close_last_popup_menu(e);
menu = $j( $j(this).attr('rel') ); menu = $( $(this).attr('rel') );
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (menu.attr('popup')=="false") return false; if (menu.attr('popup')=="false") return false;
// $j(this).parent().toggleClass("selected"); // $(this).parent().toggleClass("selected");
// menu.toggle(); // menu.toggle();
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
$j(this).parent().addClass("selected"); $(this).parent().addClass("selected");
menu.show(); menu.show();
if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').hide(); if (menu.attr('id') == "nav-notifications-menu" ) $('.main-container').hide();
last_popup_menu = menu; last_popup_menu = menu;
last_popup_button = $j(this).parent(); last_popup_button = $(this).parent();
} else { } else {
$j(this).parent().removeClass("selected"); $(this).parent().removeClass("selected");
menu.hide(); menu.hide();
if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show(); if (menu.attr('id') == "nav-notifications-menu" ) $('.main-container').show();
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
} }
return false; return false;
}); });
$j('html').click(function(e) { $('html').click(function(e) {
close_last_popup_menu(e); close_last_popup_menu(e);
}); });
// fancyboxes // fancyboxes
/*$j("a.popupbox").colorbox({ /*$("a.popupbox").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'none' 'transition' : 'none'
});*/ });*/
/* notifications template */ /* notifications template */
var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html()); var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
var notifications_all = unescape($j('<div>').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
var notifications_mark = unescape($j('<div>').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
var notifications_empty = unescape($j("#nav-notifications-menu").html()); var notifications_empty = unescape($("#nav-notifications-menu").html());
/* nav update event */ /* nav update event */
$j('nav').bind('nav-update', function(e,data){; $('nav').bind('nav-update', function(e,data){;
var invalid = $j(data).find('invalid').text(); var invalid = $(data).find('invalid').text();
if(invalid == 1) { window.location.href=window.location.href } if(invalid == 1) { window.location.href=window.location.href }
var net = $j(data).find('net').text(); var net = $(data).find('net').text();
if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') } if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
$j('#net-update').html(net); $('#net-update').html(net);
var home = $j(data).find('home').text(); var home = $(data).find('home').text();
if(home == 0) { home = ''; $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') } if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$j('#home-update').html(home); $('#home-update').html(home);
var intro = $j(data).find('intro').text(); var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') } if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
$j('#intro-update').html(intro); $('#intro-update').html(intro);
var mail = $j(data).find('mail').text(); var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') } if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
$j('#mail-update').html(mail); $('#mail-update').html(mail);
var intro = $j(data).find('intro').text(); var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') } if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
$j('#intro-update-li').html(intro); $('#intro-update-li').html(intro);
var mail = $j(data).find('mail').text(); var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') } if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$j('#mail-update-li').html(mail); $('#mail-update-li').html(mail);
var eNotif = $j(data).find('notif') var eNotif = $(data).find('notif')
if (eNotif.children("note").length==0){ if (eNotif.children("note").length==0){
$j("#nav-notifications-menu").html(notifications_empty); $("#nav-notifications-menu").html(notifications_empty);
} else { } else {
nnm = $j("#nav-notifications-menu"); nnm = $("#nav-notifications-menu");
nnm.html(notifications_all + notifications_mark); nnm.html(notifications_all + notifications_mark);
//nnm.attr('popup','true'); //nnm.attr('popup','true');
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $j(this); e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
nnm.append(html); nnm.append(html);
}); });
$j("img[data-src]", nnm).each(function(i, el){ $("img[data-src]", nnm).each(function(i, el){
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
// However, don't bother if the data-src attribute is empty, because // However, don't bother if the data-src attribute is empty, because
// an empty "src" tag for an image will cause some browsers // an empty "src" tag for an image will cause some browsers
// to prefetch the root page of the Friendica hub, which will // to prefetch the root page of the Friendica hub, which will
// unnecessarily load an entire profile/ or network/ page // unnecessarily load an entire profile/ or network/ page
if($j(el).data("src") != '') $j(el).attr('src', $j(el).data("src")); if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
}); });
} }
notif = eNotif.attr('count'); notif = eNotif.attr('count');
if (notif>0){ if (notif>0){
$j("#nav-notifications-linkmenu").addClass("on"); $("#nav-notifications-linkmenu").addClass("on");
} else { } else {
$j("#nav-notifications-linkmenu").removeClass("on"); $("#nav-notifications-linkmenu").removeClass("on");
} }
if(notif == 0) { notif = ''; $j('#notify-update').removeClass('show') } else { $j('#notify-update').addClass('show') } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
$j('#notify-update').html(notif); $('#notify-update').html(notif);
var eSysmsg = $j(data).find('sysmsgs'); var eSysmsg = $(data).find('sysmsgs');
eSysmsg.children("notice").each(function(){ eSysmsg.children("notice").each(function(){
text = $j(this).text(); text = $(this).text();
$j.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 }); $.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 });
}); });
eSysmsg.children("info").each(function(){ eSysmsg.children("info").each(function(){
text = $j(this).text(); text = $(this).text();
$j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 }); $.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
}); });
}); });
@ -221,7 +221,7 @@
NavUpdate(); NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key // Allow folks to stop the ajax page updates with the pause/break key
/* $j(document).keydown(function(event) { /* $(document).keydown(function(event) {
if(event.keyCode == '8') { if(event.keyCode == '8') {
var target = event.target || event.srcElement; var target = event.target || event.srcElement;
if (!/input|textarea/i.test(target.nodeName)) { if (!/input|textarea/i.test(target.nodeName)) {
@ -235,7 +235,7 @@
if (event.ctrlKey) { if (event.ctrlKey) {
totStopped = true; totStopped = true;
} }
$j('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />'); $('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
} else { } else {
unpause(); unpause();
} }
@ -253,28 +253,28 @@
if(! stopped) { if(! stopped) {
var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
$j.get(pingCmd,function(data) { $.get(pingCmd,function(data) {
$j(data).find('result').each(function() { $(data).find('result').each(function() {
// send nav-update event // send nav-update event
$j('nav').trigger('nav-update', this); $('nav').trigger('nav-update', this);
// start live update // start live update
if($j('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($j('#live-community').length) { src = 'community'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
if($j('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); }
/*if($j('#live-display').length) { /*if($('#live-display').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
} }
}*/ }*/
if($j('#live-photos').length) { if($('#live-photos').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
@ -291,8 +291,8 @@
} }
function liveUpdate() { function liveUpdate() {
if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; } if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($j('.comment-edit-text-full').length) || (in_progress)) { if(($('.comment-edit-text-full').length) || (in_progress)) {
if(livetime) { if(livetime) {
clearTimeout(livetime); clearTimeout(livetime);
} }
@ -308,50 +308,50 @@
var udargs = ((netargs.length) ? '/' + netargs : ''); var udargs = ((netargs.length) ? '/' + netargs : '');
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
$j.get(update_url,function(data) { $.get(update_url,function(data) {
in_progress = false; in_progress = false;
// $j('.collapsed-comments',data).each(function() { // $('.collapsed-comments',data).each(function() {
// var ident = $j(this).attr('id'); // var ident = $(this).attr('id');
// var is_hidden = $j('#' + ident).is(':hidden'); // var is_hidden = $('#' + ident).is(':hidden');
// if($j('#' + ident).length) { // if($('#' + ident).length) {
// $j('#' + ident).replaceWith($j(this)); // $('#' + ident).replaceWith($(this));
// if(is_hidden) // if(is_hidden)
// $j('#' + ident).hide(); // $('#' + ident).hide();
// } // }
//}); //});
// add a new thread // add a new thread
$j('.toplevel_item',data).each(function() { $('.toplevel_item',data).each(function() {
var ident = $j(this).attr('id'); var ident = $(this).attr('id');
if($j('#' + ident).length == 0 && profile_page == 1) { if($('#' + ident).length == 0 && profile_page == 1) {
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$j('#' + prev).after($j(this)); $('#' + prev).after($(this));
} }
else { else {
// Find out if the hidden comments are open, so we can keep it that way // Find out if the hidden comments are open, so we can keep it that way
// if a new comment has been posted // if a new comment has been posted
var id = $j('.hide-comments-total', this).attr('id'); var id = $('.hide-comments-total', this).attr('id');
if(typeof id != 'undefined') { if(typeof id != 'undefined') {
id = id.split('-')[3]; id = id.split('-')[3];
var commentsOpen = $j("#collapsed-comments-" + id).is(":visible"); var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
} }
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
//vScroll = $j(document).scrollTop(); //vScroll = $(document).scrollTop();
$j('html').height($j('html').height()); $('html').height($('html').height());
$j('#' + ident).replaceWith($j(this)); $('#' + ident).replaceWith($(this));
if(typeof id != 'undefined') { if(typeof id != 'undefined') {
if(commentsOpen) showHideComments(id); if(commentsOpen) showHideComments(id);
} }
$j('html').height('auto'); $('html').height('auto');
//$j(document).scrollTop(vScroll); //$(document).scrollTop(vScroll);
} }
prev = ident; prev = ident;
}); });
@ -363,36 +363,36 @@
/*prev = 'live-' + src; /*prev = 'live-' + src;
$j('.wall-item-outside-wrapper',data).each(function() { $('.wall-item-outside-wrapper',data).each(function() {
var ident = $j(this).attr('id'); var ident = $(this).attr('id');
if($j('#' + ident).length == 0 && prev != 'live-' + src) { if($('#' + ident).length == 0 && prev != 'live-' + src) {
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$j('#' + prev).after($j(this)); $('#' + prev).after($(this));
} }
else { else {
$j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
if($j('#' + ident + ' ' + '.comment-edit-text-empty').length) if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
$j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper')); $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total')); $('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
$j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like')); $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
$j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike')); $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
$j('#' + ident + ' ' + '.my-comment-photo').each(function() { $('#' + ident + ' ' + '.my-comment-photo').each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
} }
prev = ident; prev = ident;
});*/ });*/
$j('.like-rotator').hide(); $('.like-rotator').hide();
if(commentBusy) { if(commentBusy) {
commentBusy = false; commentBusy = false;
$j('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
} }
/* autocomplete @nicknames */ /* autocomplete @nicknames */
$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
// setup videos, since VideoJS won't take care of any loaded via AJAX // setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof videojs != 'undefined') videojs.autoSetup(); if(typeof videojs != 'undefined') videojs.autoSetup();
@ -404,22 +404,22 @@
if(typeof elems != 'undefined') { if(typeof elems != 'undefined') {
elemName = elems + ' ' + elemName; elemName = elems + ' ' + elemName;
} }
$j(elemName).each(function() { $(elemName).each(function() {
if($j(this).height() > 350) { if($(this).height() > 350) {
$j('html').height($j('html').height()); $('html').height($('html').height());
$j(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 }); $(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 });
$j(this).addClass('divmore'); $(this).addClass('divmore');
$j('html').height('auto'); $('html').height('auto');
} }
}); });
} }
/* function imgbright(node) { /* function imgbright(node) {
$j(node).removeClass("drophide").addClass("drop"); $(node).removeClass("drophide").addClass("drop");
} }
function imgdull(node) { function imgdull(node) {
$j(node).removeClass("drop").addClass("drophide"); $(node).removeClass("drop").addClass("drophide");
}*/ }*/
// Since our ajax calls are asynchronous, we will give a few // Since our ajax calls are asynchronous, we will give a few
@ -434,8 +434,8 @@
function dolike(ident,verb) { function dolike(ident,verb) {
unpause(); unpause();
$j('#like-rotator-' + ident.toString()).show(); $('#like-rotator-' + ident.toString()).show();
$j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
@ -443,21 +443,21 @@
function dostar(ident) { function dostar(ident) {
ident = ident.toString(); ident = ident.toString();
//$j('#like-rotator-' + ident).show(); //$('#like-rotator-' + ident).show();
$j.get('starred/' + ident, function(data) { $.get('starred/' + ident, function(data) {
if(data.match(/1/)) { if(data.match(/1/)) {
$j('#starred-' + ident).addClass('starred'); $('#starred-' + ident).addClass('starred');
$j('#starred-' + ident).removeClass('unstarred'); $('#starred-' + ident).removeClass('unstarred');
$j('#star-' + ident).addClass('hidden'); $('#star-' + ident).addClass('hidden');
$j('#unstar-' + ident).removeClass('hidden'); $('#unstar-' + ident).removeClass('hidden');
} }
else { else {
$j('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).addClass('unstarred');
$j('#starred-' + ident).removeClass('starred'); $('#starred-' + ident).removeClass('starred');
$j('#star-' + ident).removeClass('hidden'); $('#star-' + ident).removeClass('hidden');
$j('#unstar-' + ident).addClass('hidden'); $('#unstar-' + ident).addClass('hidden');
} }
//$j('#like-rotator-' + ident).hide(); //$('#like-rotator-' + ident).hide();
}); });
} }
@ -492,31 +492,31 @@
} }
else { else {
lockvisible = true; lockvisible = true;
$j.get('lockview/' + id, function(data) { $.get('lockview/' + id, function(data) {
$j('#panel').html(data); $('#panel').html(data);
$j('#panel').css({ 'left': 10 , 'top': cursor.y + 20}); $('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
$j('#panel').show(); $('#panel').show();
}); });
} }
} }
function lockviewhide() { function lockviewhide() {
lockvisible = false; lockvisible = false;
$j('#panel').hide(); $('#panel').hide();
} }
function post_comment(id) { function post_comment(id) {
unpause(); unpause();
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j("#comment-preview-inp-" + id).val("0"); $("#comment-preview-inp-" + id).val("0");
$j.post( $.post(
"item", "item",
$j("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.success) { if(data.success) {
$j("#comment-edit-wrapper-" + id).hide(); $("#comment-edit-wrapper-" + id).hide();
$j("#comment-edit-text-" + id).val(''); $("#comment-edit-text-" + id).val('');
var tarea = document.getElementById("comment-edit-text-" + id); var tarea = document.getElementById("comment-edit-text-" + id);
if(tarea) if(tarea)
commentClose(tarea,id); commentClose(tarea,id);
@ -534,16 +534,16 @@
function preview_comment(id) { function preview_comment(id) {
$j("#comment-preview-inp-" + id).val("1"); $("#comment-preview-inp-" + id).val("1");
$j("#comment-edit-preview-" + id).show(); $("#comment-edit-preview-" + id).show();
$j.post( $.post(
"item", "item",
$j("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.preview) { if(data.preview) {
$j("#comment-edit-preview-" + id).html(data.preview); $("#comment-edit-preview-" + id).html(data.preview);
$j("#comment-edit-preview-" + id + " a").click(function() { return false; }); $("#comment-edit-preview-" + id + " a").click(function() { return false; });
} }
}, },
"json" "json"
@ -553,34 +553,34 @@
function showHideComments(id) { function showHideComments(id) {
if( $j("#collapsed-comments-" + id).is(":visible")) { if( $("#collapsed-comments-" + id).is(":visible")) {
$j("#collapsed-comments-" + id).hide(); $("#collapsed-comments-" + id).hide();
$j("#hide-comments-" + id).html(window.showMore); $("#hide-comments-" + id).html(window.showMore);
} }
else { else {
$j("#collapsed-comments-" + id).show(); $("#collapsed-comments-" + id).show();
$j("#hide-comments-" + id).html(window.showFewer); $("#hide-comments-" + id).html(window.showFewer);
collapseHeight("#collapsed-comments-" + id); collapseHeight("#collapsed-comments-" + id);
} }
} }
function preview_post() { function preview_post() {
$j("#jot-preview").val("1"); $("#jot-preview").val("1");
$j("#jot-preview-content").show(); $("#jot-preview-content").show();
tinyMCE.triggerSave(); tinyMCE.triggerSave();
$j.post( $.post(
"item", "item",
$j("#profile-jot-form").serialize(), $("#profile-jot-form").serialize(),
function(data) { function(data) {
if(data.preview) { if(data.preview) {
$j("#jot-preview-content").html(data.preview); $("#jot-preview-content").html(data.preview);
$j("#jot-preview-content" + " a").click(function() { return false; }); $("#jot-preview-content" + " a").click(function() { return false; });
} }
}, },
"json" "json"
); );
$j("#jot-preview").val("0"); $("#jot-preview").val("0");
return true; return true;
} }
@ -589,7 +589,7 @@
// unpause auto reloads if they are currently stopped // unpause auto reloads if they are currently stopped
totStopped = false; totStopped = false;
stopped = false; stopped = false;
$j('#pause').html(''); $('#pause').html('');
} }
@ -617,40 +617,40 @@
} }
function groupChangeMember(gid, cid, sec_token) { function groupChangeMember(gid, cid, sec_token) {
$j('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
$j('#group-update-wrapper').html(data); $('#group-update-wrapper').html(data);
$j('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function profChangeMember(gid,cid) { function profChangeMember(gid,cid) {
$j('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$j.get('profperm/' + gid + '/' + cid, function(data) { $.get('profperm/' + gid + '/' + cid, function(data) {
$j('#prof-update-wrapper').html(data); $('#prof-update-wrapper').html(data);
$j('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function contactgroupChangeMember(gid,cid) { function contactgroupChangeMember(gid,cid) {
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('contactgroup/' + gid + '/' + cid, function(data) { $.get('contactgroup/' + gid + '/' + cid, function(data) {
$j('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
}); });
} }
function checkboxhighlight(box) { function checkboxhighlight(box) {
if($j(box).is(':checked')) { if($(box).is(':checked')) {
$j(box).addClass('checkeditem'); $(box).addClass('checkeditem');
} }
else { else {
$j(box).removeClass('checkeditem'); $(box).removeClass('checkeditem');
} }
} }
function notifyMarkAll() { function notifyMarkAll() {
$j.get('notify/mark/all', function(data) { $.get('notify/mark/all', function(data) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,1000); timer = setTimeout(NavUpdate,1000);
}); });
@ -729,9 +729,9 @@ Array.prototype.remove = function(item) {
}; };
function previewTheme(elm) { function previewTheme(elm) {
theme = $j(elm).val(); theme = $(elm).val();
$j.getJSON('pretheme?f=&theme=' + theme,function(data) { $.getJSON('pretheme?f=&theme=' + theme,function(data) {
$j('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div>'); $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div>');
}); });
} }

File diff suppressed because one or more lines are too long

View file

@ -1,60 +1,60 @@
$j(document).ready(function() { $(document).ready(function() {
/* enable tinymce on focus and click */ /* enable tinymce on focus and click */
$j("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$j("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
/*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/ /*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
/*$j('.group-edit-icon').hover( /*$('.group-edit-icon').hover(
function() { function() {
$j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$j(this).removeClass('icon'); $j(this).addClass('iconspacer');} $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$j('.sidebar-group-element').hover( $('.sidebar-group-element').hover(
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');}, $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');} $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
); );
$j('.savedsearchdrop').hover( $('.savedsearchdrop').hover(
function() { function() {
$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');} $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$j('.savedsearchterm').hover( $('.savedsearchterm').hover(
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#drop-' + id).addClass('icon'); $j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');}, $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');} $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);*/ );*/
$j('#event-share-checkbox').change(function() { $('#event-share-checkbox').change(function() {
if ($j('#event-share-checkbox').is(':checked')) { if ($('#event-share-checkbox').is(':checked')) {
$j('#acl-wrapper').show(); $('#acl-wrapper').show();
} }
else { else {
$j('#acl-wrapper').hide(); $('#acl-wrapper').hide();
} }
}).trigger('change'); }).trigger('change');
$j(".popupbox").click(function () { $(".popupbox").click(function () {
var parent = $j( $j(this).attr('href') ).parent(); var parent = $( $(this).attr('href') ).parent();
if (parent.css('display') == 'none') { if (parent.css('display') == 'none') {
parent.show(); parent.show();
} else { } else {
@ -70,23 +70,23 @@ $j(document).ready(function() {
window.imageUploadButton, window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname+'?nomce=1', { action: 'wall_upload/'+window.nickname+'?nomce=1',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
addeditortext(window.jotId, response); addeditortext(window.jotId, response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );
if($j('#wall-file-upload').length) { if($('#wall-file-upload').length) {
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/'+window.nickname+'?nomce=1', { action: 'wall_attach/'+window.nickname+'?nomce=1',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
addeditortext(window.jotId, response); addeditortext(window.jotId, response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );
@ -103,17 +103,17 @@ $j(document).ready(function() {
switch(window.autocompleteType) { switch(window.autocompleteType) {
case 'msg-header': case 'msg-header':
var a = $j("#recip").autocomplete({ var a = $("#recip").autocomplete({
serviceUrl: baseurl + '/acl', serviceUrl: baseurl + '/acl',
minChars: 2, minChars: 2,
width: 350, width: 350,
onSelect: function(value,data) { onSelect: function(value,data) {
$j("#recip-complete").val(data); $("#recip-complete").val(data);
} }
}); });
break; break;
case 'contacts-head': case 'contacts-head':
var a = $j("#contacts-search").autocomplete({ var a = $("#contacts-search").autocomplete({
serviceUrl: baseurl + '/acl', serviceUrl: baseurl + '/acl',
minChars: 2, minChars: 2,
width: 350, width: 350,
@ -121,7 +121,7 @@ $j(document).ready(function() {
a.setOptions({ params: { type: 'a' }}); a.setOptions({ params: { type: 'a' }});
break; break;
case 'display-head': case 'display-head':
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
break; break;
default: default:
break; break;
@ -129,31 +129,31 @@ $j(document).ready(function() {
/* if(window.autoCompleteType == "display-head") { /* if(window.autoCompleteType == "display-head") {
//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); //$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places // make auto-complete work in more places
//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); //$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}*/ }*/
if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") { if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $j(this).text(); selstr = $(this).text();
$j('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$j('#jot-public').hide(); $('#jot-public').hide();
}); });
if(selstr == null) { if(selstr == null) {
$j('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$j('#jot-public').show(); $('#jot-public').show();
} }
}).trigger('change'); }).trigger('change');
} }
if(window.aclType == "event_head") { if(window.aclType == "event_head") {
$j('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: baseurl + '/events/json/', events: baseurl + '/events/json/',
header: { header: {
left: 'prev,next today', left: 'prev,next today',
@ -203,7 +203,7 @@ $j(document).ready(function() {
// center on date // center on date
var args=location.href.replace(baseurl,"").split("/"); var args=location.href.replace(baseurl,"").split("/");
if (args.length>=4) { if (args.length>=4) {
$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
} }
// show event popup // show event popup
@ -214,11 +214,11 @@ $j(document).ready(function() {
}); });
// update pending count // // update pending count //
$j(function(){ $(function(){
$j("nav").bind('nav-update', function(e,data){ $("nav").bind('nav-update', function(e,data){
var elm = $j('#pending-update'); var elm = $('#pending-update');
var register = $j(data).find('register').text(); var register = $(data).find('register').text();
if (register=="0") { register=""; elm.hide();} else { elm.show(); } if (register=="0") { register=""; elm.hide();} else { elm.show(); }
elm.html(register); elm.html(register);
}); });
@ -227,7 +227,7 @@ $j(function(){
function homeRedirect() { function homeRedirect() {
$j('html').fadeOut('slow', function(){ $('html').fadeOut('slow', function(){
window.location = baseurl + "/login"; window.location = baseurl + "/login";
}); });
} }
@ -235,12 +235,12 @@ function homeRedirect() {
function initCrop() { function initCrop() {
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
Event.observe( window, 'load', function() { Event.observe( window, 'load', function() {
@ -261,10 +261,10 @@ function initCrop() {
function showEvent(eventid) { function showEvent(eventid) {
/* $j.get( /* $.get(
baseurl + '/events/?id='+eventid, baseurl + '/events/?id='+eventid,
function(data){ function(data){
$j.colorbox({html:data}); $.colorbox({html:data});
} }
);*/ );*/
} }
@ -282,27 +282,27 @@ var plaintext = 'none';//window.editSelect;
function initEditor(cb){ function initEditor(cb){
if (editor==false){ if (editor==false){
// $j("#profile-jot-text-loading").show(); // $("#profile-jot-text-loading").show();
if(plaintext == 'none') { if(plaintext == 'none') {
// $j("#profile-jot-text-loading").hide(); // $("#profile-jot-text-loading").hide();
$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
/* $j("a#jot-perms-icon").colorbox({ /* $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
});*/ });*/
$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $j("#profile-jot-acl-wrapper").parent(); var parent = $("#profile-jot-acl-wrapper").parent();
if (parent.css('display') == 'none') { if (parent.css('display') == 'none') {
parent.show(); parent.show();
} else { } else {
parent.hide(); parent.hide();
} }
// $j("#profile-jot-acl-wrapper").parent().toggle(); // $("#profile-jot-acl-wrapper").parent().toggle();
return false; return false;
}); });
$j(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
return; return;
} }
@ -352,37 +352,37 @@ function initEditor(cb){
} }
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) { if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$j('#profile-jot-desc').html(ispublic); $('#profile-jot-desc').html(ispublic);
} }
else { else {
$j('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
//Character count //Character count
if(textlen <= 140) { if(textlen <= 140) {
$j('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$j('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$j('#character-counter').addClass('grey'); $('#character-counter').addClass('grey');
} }
if((textlen > 140) && (textlen <= 420)) { if((textlen > 140) && (textlen <= 420)) {
$j('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$j('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$j('#character-counter').addClass('orange'); $('#character-counter').addClass('orange');
} }
if(textlen > 420) { if(textlen > 420) {
$j('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$j('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$j('#character-counter').addClass('red'); $('#character-counter').addClass('red');
} }
$j('#character-counter').text(textlen); $('#character-counter').text(textlen);
}); });
ed.onInit.add(function(ed) { ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true; ed.pasteAsPlainText = true;
$j("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$j(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
}); });
@ -390,7 +390,7 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$j("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
}); */ }); */
@ -401,7 +401,7 @@ function initEditor(cb){
function enableOnUser(){ function enableOnUser(){
if (editor) return; if (editor) return;
$j(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
@ -436,9 +436,9 @@ function enableOnUser(){
ed.onInit.add(function(ed) { ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true; ed.pasteAsPlainText = true;
var editorId = ed.editorId; var editorId = ed.editorId;
var textarea = $j('#'+editorId); var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") { if (typeof(textarea.attr('tabindex')) != "undefined") {
$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null); textarea.attr('tabindex', null);
} }
}); });
@ -446,7 +446,7 @@ function enableOnUser(){
}); });
} }
else else
$j("#prvmail-text").contact_autocomplete(baseurl+"/acl"); $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
}*/ }*/
@ -457,8 +457,8 @@ function enableOnUser(){
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') { if(window.editSelect == 'none') {
var currentText = $j(textElem).val(); var currentText = $(textElem).val();
$j(textElem).val(currentText + data); $(textElem).val(currentText + data);
} }
/* else /* else
tinyMCE.execCommand('mceInsertRawHTML',false,data);*/ tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
@ -480,22 +480,22 @@ function jotAudioURL() {
function jotGetLocation() { function jotGetLocation() {
reply = prompt(window.whereAreU, $j('#jot-location').val()); reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$j('#jot-location').val(reply); $('#jot-location').val(reply);
} }
} }
function jotShare(id) { function jotShare(id) {
if ($j('#jot-popup').length != 0) $j('#jot-popup').show(); if ($('#jot-popup').length != 0) $('#jot-popup').show();
$j('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$j.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $j("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
addeditortext("#profile-jot-text", data); addeditortext("#profile-jot-text", data);
$j('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
$j(window).scrollTop(0); $(window).scrollTop(0);
}); });
}); });
@ -505,10 +505,10 @@ function jotGetLink() {
reply = prompt(window.linkURL); reply = prompt(window.linkURL);
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$j('#profile-rotator').show(); $('#profile-rotator').show();
$j.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
addeditortext(window.jotId, data); addeditortext(window.jotId, data);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });
} }
} }
@ -525,20 +525,20 @@ function linkdrop(event) {
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$j('#profile-rotator').show(); $('#profile-rotator').show();
$j.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
//if (!editor) $j("#profile-jot-text").val(""); //if (!editor) $("#profile-jot-text").val("");
//initEditor(function(){ //initEditor(function(){
addeditortext(window.jotId, data); addeditortext(window.jotId, data);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
//}); //});
}); });
} }
}*/ }*/
function jotClearLocation() { function jotClearLocation() {
$j('#jot-coord').val(''); $('#jot-coord').val('');
$j('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();
} }
if(typeof window.geoTag === 'function') window.geoTag(); if(typeof window.geoTag === 'function') window.geoTag();
@ -554,17 +554,17 @@ function confirmDelete() { return confirm(window.delItem); }
/*function deleteCheckedItems() { /*function deleteCheckedItems() {
var checkedstr = ''; var checkedstr = '';
$j('.item-select').each( function() { $('.item-select').each( function() {
if($j(this).is(':checked')) { if($(this).is(':checked')) {
if(checkedstr.length != 0) { if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $j(this).val(); checkedstr = checkedstr + ',' + $(this).val();
} }
else { else {
checkedstr = $j(this).val(); checkedstr = $(this).val();
} }
} }
}); });
$j.post('item', { dropitems: checkedstr }, function(data) { $.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload(); window.location.reload();
}); });
}*/ }*/
@ -576,9 +576,9 @@ function itemTag(id) {
if(reply.length) { if(reply.length) {
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('tagger/' + id + '?term=' + reply, NavUpdate); $.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer); /*if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
@ -588,46 +588,46 @@ function itemTag(id) {
function itemFiler(id) { function itemFiler(id) {
$j.get('filer/', function(data){ $.get('filer/', function(data){
var promptText = $j('#id_term_label', data).text(); var promptText = $('#id_term_label', data).text();
reply = prompt(promptText); reply = prompt(promptText);
if(reply && reply.length) { if(reply && reply.length) {
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer); /* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
/* $j.colorbox.close();*/ /* $.colorbox.close();*/
} }
}); });
/* var bordercolor = $j("input").css("border-color"); /* var bordercolor = $("input").css("border-color");
$j.get('filer/', function(data){ $.get('filer/', function(data){
$j.colorbox({html:data}); $.colorbox({html:data});
$j("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
$j("#select_term").change(function(){ $("#select_term").change(function(){
$j("#id_term").css("border-color",bordercolor); $("#id_term").css("border-color",bordercolor);
}) })
$j("#filer_save").click(function(e){ $("#filer_save").click(function(e){
e.preventDefault(); e.preventDefault();
reply = $j("#id_term").val(); reply = $("#id_term").val();
if(reply && reply.length) { if(reply && reply.length) {
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('filer/' + id + '?term=' + reply); $.get('filer/' + id + '?term=' + reply);
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$j.colorbox.close(); $.colorbox.close();
} else { } else {
$j("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }
return false; return false;
}); });
@ -645,75 +645,75 @@ function itemFiler(id) {
function commentOpen(obj,id) { function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) { if(obj.value == window.commentEmptyText) {
obj.value = ""; obj.value = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$j("#mod-cmnt-wrap-" + id).show(); $("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
} }
function commentClose(obj,id) { function commentClose(obj,id) {
if(obj.value == "") { if(obj.value == "") {
obj.value = window.commentEmptyText; obj.value = window.commentEmptyText;
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$j("#mod-cmnt-wrap-" + id).hide(); $("#mod-cmnt-wrap-" + id).hide();
closeMenu("comment-edit-submit-wrapper-" + id); closeMenu("comment-edit-submit-wrapper-" + id);
} }
} }
function commentInsert(obj,id) { function commentInsert(obj,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) { if(tmpStr == window.commentEmptyText) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $j(obj).html(); var ins = $(obj).html();
ins = ins.replace("&lt;","<"); ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">"); ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&"); ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;",'"'); ins = ins.replace("&quot;",'"');
$j("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
} }
function qCommentInsert(obj,id) { function qCommentInsert(obj,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) { if(tmpStr == window.commentEmptyText) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $j(obj).val(); var ins = $(obj).val();
ins = ins.replace("&lt;","<"); ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">"); ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&"); ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;",'"'); ins = ins.replace("&quot;",'"');
$j("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
$j(obj).val(""); $(obj).val("");
} }
/*function showHideCommentBox(id) { /*function showHideCommentBox(id) {
if( $j('#comment-edit-form-' + id).is(':visible')) { if( $('#comment-edit-form-' + id).is(':visible')) {
$j('#comment-edit-form-' + id).hide(); $('#comment-edit-form-' + id).hide();
} }
else { else {
$j('#comment-edit-form-' + id).show(); $('#comment-edit-form-' + id).show();
} }
}*/ }*/
function insertFormatting(comment,BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
$j("#comment-edit-text-" + id).val(tmpStr); $("#comment-edit-text-" + id).val(tmpStr);
} }
textarea = document.getElementById("comment-edit-text-" +id); textarea = document.getElementById("comment-edit-text-" +id);
@ -736,10 +736,10 @@ function insertFormatting(comment,BBcode,id) {
} }
function cmtBbOpen(id) { function cmtBbOpen(id) {
$j(".comment-edit-bb-" + id).show(); $(".comment-edit-bb-" + id).show();
} }
function cmtBbClose(id) { function cmtBbClose(id) {
$j(".comment-edit-bb-" + id).hide(); $(".comment-edit-bb-" + id).hide();
} }

File diff suppressed because one or more lines are too long

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script> <script>
function confirm_delete(uname){ function confirm_delete(uname){
return confirm( "{{$confirm_delete}}".format(uname)); return confirm( "{{$confirm_delete}}".format(uname));
@ -11,7 +6,7 @@
return confirm("{{$confirm_delete_multi}}"); return confirm("{{$confirm_delete_multi}}");
} }
function selectall(cls){ function selectall(cls){
$j("."+cls).attr('checked','checked'); $("."+cls).attr('checked','checked');
return false; return false;
} }
</script> </script>

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p id="cropimage-desc"> <p id="cropimage-desc">
{{$desc}} {{$desc}}

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
<script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

View file

@ -1,6 +1 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" /> <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!--[if IE]> <!--[if IE]>
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
@ -11,7 +6,6 @@
tinyMCE.init({ mode : "none"}); tinyMCE.init({ mode : "none"});
</script>-->*}} </script>-->*}}
<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script> {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input' id='wrapper_{{$field.0}}'> <div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label><br /> <label for='id_{{$field.0}}'>{{$field.1}}</label><br />

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input openid' id='wrapper_{{$field.0}}'> <div class='field input openid' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label><br /> <label for='id_{{$field.0}}'>{{$field.1}}</label><br />

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field password' id='wrapper_{{$field.0}}'> <div class='field password' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label><br /> <label for='id_{{$field.0}}'>{{$field.1}}</label><br />

View file

@ -1,16 +1,11 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
if(navigator.geolocation) { if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) { navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4); var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4); var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon); $('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show(); $('#profile-nolocation-wrapper').show();
}); });
} }

View file

@ -1,7 +1,2 @@
{{* <script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>

View file

@ -28,6 +28,6 @@ function frost_mobile_content_loaded(&$a) {
$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css'; $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css';
} }
if( $a->module === 'login' ) if( $a->module === 'login' )
$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>'; $a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
} }

View file

@ -13,41 +13,41 @@ function ACL(backend_url, preset){
that.group_uids = []; that.group_uids = [];
that.nw = 3; //items per row. should be calulated from #acl-list.width that.nw = 3; //items per row. should be calulated from #acl-list.width
that.list_content = $j("#acl-list-content"); that.list_content = $("#acl-list-content");
that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html()); that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $j("#acl-showall"); that.showall = $("#acl-showall");
if (preset.length==0) that.showall.addClass("selected"); if (preset.length==0) that.showall.addClass("selected");
/*events*/ /*events*/
that.showall.click(that.on_showall); that.showall.click(that.on_showall);
$j(".acl-button-show").live('click', that.on_button_show); $(".acl-button-show").live('click', that.on_button_show);
$j(".acl-button-hide").live('click', that.on_button_hide); $(".acl-button-hide").live('click', that.on_button_hide);
$j("#acl-search").keypress(that.on_search); $("#acl-search").keypress(that.on_search);
$j("#acl-wrapper").parents("form").submit(that.on_submit); $("#acl-wrapper").parents("form").submit(that.on_submit);
/* startup! */ /* startup! */
that.get(0,100); that.get(0,100);
} }
ACL.prototype.on_submit = function(){ ACL.prototype.on_submit = function(){
aclfileds = $j("#acl-fields").html(""); aclfileds = $("#acl-fields").html("");
$j(that.allow_gid).each(function(i,v){ $(that.allow_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
}); });
$j(that.allow_cid).each(function(i,v){ $(that.allow_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
}); });
$j(that.deny_gid).each(function(i,v){ $(that.deny_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
}); });
$j(that.deny_cid).each(function(i,v){ $(that.deny_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
}); });
} }
ACL.prototype.search = function(){ ACL.prototype.search = function(){
var srcstr = $j("#acl-search").val(); var srcstr = $("#acl-search").val();
that.list_content.html(""); that.list_content.html("");
that.get(0,100, srcstr); that.get(0,100, srcstr);
} }
@ -82,10 +82,10 @@ ACL.prototype.on_button_show = function(event){
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*that.showall.removeClass("selected");
$j(this).siblings(".acl-button-hide").removeClass("selected"); $(this).siblings(".acl-button-hide").removeClass("selected");
$j(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_allow($j(this).parent().attr('id')); that.set_allow($(this).parent().attr('id'));
return false; return false;
} }
@ -95,10 +95,10 @@ ACL.prototype.on_button_hide = function(event){
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*that.showall.removeClass("selected");
$j(this).siblings(".acl-button-show").removeClass("selected"); $(this).siblings(".acl-button-show").removeClass("selected");
$j(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_deny($j(this).parent().attr('id')); that.set_deny($(this).parent().attr('id'));
return false; return false;
} }
@ -156,32 +156,32 @@ ACL.prototype.update_view = function(){
that.deny_gid.length==0 && that.deny_cid.length==0){ that.deny_gid.length==0 && that.deny_cid.length==0){
that.showall.addClass("selected"); that.showall.addClass("selected");
/* jot acl */ /* jot acl */
$j('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$j('#jot-public').show(); $('#jot-public').show();
$j('.profile-jot-net input').attr('disabled', false); $('.profile-jot-net input').attr('disabled', false);
if(typeof editor != 'undefined' && editor != false) { if(typeof editor != 'undefined' && editor != false) {
$j('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
} else { } else {
that.showall.removeClass("selected"); that.showall.removeClass("selected");
/* jot acl */ /* jot acl */
$j('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$j('#jot-public').hide(); $('#jot-public').hide();
$j('.profile-jot-net input').attr('disabled', 'disabled'); $('.profile-jot-net input').attr('disabled', 'disabled');
$j('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
$j("#acl-list-content .acl-list-item").each(function(){ $("#acl-list-content .acl-list-item").each(function(){
$j(this).removeClass("groupshow grouphide"); $(this).removeClass("groupshow grouphide");
}); });
$j("#acl-list-content .acl-list-item").each(function(){ $("#acl-list-content .acl-list-item").each(function(){
itemid = $j(this).attr('id'); itemid = $(this).attr('id');
type = itemid[0]; type = itemid[0];
id = parseInt(itemid.substr(1)); id = parseInt(itemid.substr(1));
btshow = $j(this).children(".acl-button-show").removeClass("selected"); btshow = $(this).children(".acl-button-show").removeClass("selected");
bthide = $j(this).children(".acl-button-hide").removeClass("selected"); bthide = $(this).children(".acl-button-hide").removeClass("selected");
switch(type){ switch(type){
case "g": case "g":
@ -197,16 +197,16 @@ ACL.prototype.update_view = function(){
uclass="grouphide"; uclass="grouphide";
} }
$j(that.group_uids[id]).each(function(i,v) { $(that.group_uids[id]).each(function(i,v) {
if(uclass == "grouphide") if(uclass == "grouphide")
$j("#c"+v).removeClass("groupshow"); $("#c"+v).removeClass("groupshow");
if(uclass != "") { if(uclass != "") {
var cls = $j("#c"+v).attr('class'); var cls = $("#c"+v).attr('class');
if( cls == undefined) if( cls == undefined)
return true; return true;
var hiding = cls.indexOf('grouphide'); var hiding = cls.indexOf('grouphide');
if(hiding == -1) if(hiding == -1)
$j("#c"+v).addClass(uclass); $("#c"+v).addClass(uclass);
} }
}); });
@ -234,7 +234,7 @@ ACL.prototype.get = function(start,count, search){
search:search, search:search,
} }
$j.ajax({ $.ajax({
type:'POST', type:'POST',
url: that.url, url: that.url,
data: postdata, data: postdata,
@ -246,16 +246,16 @@ ACL.prototype.get = function(start,count, search){
ACL.prototype.populate = function(data){ ACL.prototype.populate = function(data){
var height = Math.ceil(data.tot / that.nw) * 42; var height = Math.ceil(data.tot / that.nw) * 42;
that.list_content.height(height); that.list_content.height(height);
$j(data.items).each(function(){ $(data.items).each(function(){
html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link ); html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
if (this.uids!=undefined) that.group_uids[this.id] = this.uids; if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); that.list_content.append(html);
}); });
$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){ $(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
$j(el).attr('src', $j(el).data("src")); $(el).attr('src', $(el).data("src"));
}); });
that.update_view(); that.update_view();
} }

File diff suppressed because one or more lines are too long

View file

@ -10,13 +10,13 @@
listID = listID.replace(/\./g, "\\."); listID = listID.replace(/\./g, "\\.");
listID = listID.replace(/@/g, "\\@"); listID = listID.replace(/@/g, "\\@");
if($j(listID).is(":visible")) { if($(listID).is(":visible")) {
$j(listID).hide(); $(listID).hide();
$j(listID+"-wrapper").show(); $(listID+"-wrapper").show();
} }
else { else {
$j(listID).show(); $(listID).show();
$j(listID+"-wrapper").hide(); $(listID+"-wrapper").hide();
} }
} }
@ -45,16 +45,16 @@
var last_popup_menu = null; var last_popup_menu = null;
var last_popup_button = null; var last_popup_button = null;
$j(function() { $(function() {
$j.ajaxSetup({cache: false}); $.ajaxSetup({cache: false});
msie = $j.browser.msie ; msie = $.browser.msie ;
collapseHeight(); collapseHeight();
/* setup tooltips *//* /* setup tooltips *//*
$j("a,.tt").each(function(){ $("a,.tt").each(function(){
var e = $j(this); var e = $(this);
var pos="bottom"; var pos="bottom";
if (e.hasClass("tttop")) pos="top"; if (e.hasClass("tttop")) pos="top";
if (e.hasClass("ttbottom")) pos="bottom"; if (e.hasClass("ttbottom")) pos="bottom";
@ -66,19 +66,19 @@
/* setup onoff widgets */ /* setup onoff widgets */
$j(".onoff input").each(function(){ $(".onoff input").each(function(){
val = $j(this).val(); val = $(this).val();
id = $j(this).attr("id"); id = $(this).attr("id");
$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
}); });
$j(".onoff > a").click(function(event){ $(".onoff > a").click(function(event){
event.preventDefault(); event.preventDefault();
var input = $j(this).siblings("input"); var input = $(this).siblings("input");
var val = 1-input.val(); var val = 1-input.val();
var id = input.attr("id"); var id = input.attr("id");
$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
$j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
input.val(val); input.val(val);
//console.log(id); //console.log(id);
}); });
@ -90,7 +90,7 @@
function close_last_popup_menu(e) { function close_last_popup_menu(e) {
if( last_popup_menu ) { if( last_popup_menu ) {
if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) { if( '#' + last_popup_menu.attr('id') !== $(e.target).attr('rel')) {
last_popup_menu.hide(); last_popup_menu.hide();
last_popup_button.removeClass("selected"); last_popup_button.removeClass("selected");
last_popup_menu = null; last_popup_menu = null;
@ -98,16 +98,16 @@
} }
} }
} }
$j('a[rel^=#]').click(function(e){ $('a[rel^=#]').click(function(e){
close_last_popup_menu(e); close_last_popup_menu(e);
menu = $j( $j(this).attr('rel') ); menu = $( $(this).attr('rel') );
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (menu.attr('popup')=="false") return false; if (menu.attr('popup')=="false") return false;
$j(this).parent().toggleClass("selected"); $(this).parent().toggleClass("selected");
menu.slideToggle('fast'); menu.slideToggle('fast');
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
@ -115,97 +115,97 @@
last_popup_button = null; last_popup_button = null;
} else { } else {
last_popup_menu = menu; last_popup_menu = menu;
last_popup_button = $j(this).parent(); last_popup_button = $(this).parent();
} }
return false; return false;
}); });
$j('html').click(function(e) { $('html').click(function(e) {
close_last_popup_menu(e); close_last_popup_menu(e);
}); });
// fancyboxes // fancyboxes
$j("a.popupbox").colorbox({ $("a.popupbox").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
}); });
/* notifications template */ /* notifications template */
var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html()); var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
var notifications_all = unescape($j('<div>').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
var notifications_mark = unescape($j('<div>').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
var notifications_empty = unescape($j("#nav-notifications-menu").html()); var notifications_empty = unescape($("#nav-notifications-menu").html());
/* nav update event */ /* nav update event */
$j('nav').bind('nav-update', function(e,data){; $('nav').bind('nav-update', function(e,data){;
var invalid = $j(data).find('invalid').text(); var invalid = $(data).find('invalid').text();
if(invalid == 1) { window.location.href=window.location.href } if(invalid == 1) { window.location.href=window.location.href }
var net = $j(data).find('net').text(); var net = $(data).find('net').text();
if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') } if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
$j('#net-update').html(net); $('#net-update').html(net);
var home = $j(data).find('home').text(); var home = $(data).find('home').text();
if(home == 0) { home = ''; $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') } if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$j('#home-update').html(home); $('#home-update').html(home);
var intro = $j(data).find('intro').text(); var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') } if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
$j('#intro-update').html(intro); $('#intro-update').html(intro);
var mail = $j(data).find('mail').text(); var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') } if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
$j('#mail-update').html(mail); $('#mail-update').html(mail);
var intro = $j(data).find('intro').text(); var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') } if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
$j('#intro-update-li').html(intro); $('#intro-update-li').html(intro);
var mail = $j(data).find('mail').text(); var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') } if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$j('#mail-update-li').html(mail); $('#mail-update-li').html(mail);
var eNotif = $j(data).find('notif') var eNotif = $(data).find('notif')
if (eNotif.children("note").length==0){ if (eNotif.children("note").length==0){
$j("#nav-notifications-menu").html(notifications_empty); $("#nav-notifications-menu").html(notifications_empty);
} else { } else {
nnm = $j("#nav-notifications-menu"); nnm = $("#nav-notifications-menu");
nnm.html(notifications_all + notifications_mark); nnm.html(notifications_all + notifications_mark);
//nnm.attr('popup','true'); //nnm.attr('popup','true');
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $j(this); e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
nnm.append(html); nnm.append(html);
}); });
$j("img[data-src]", nnm).each(function(i, el){ $("img[data-src]", nnm).each(function(i, el){
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
// However, don't bother if the data-src attribute is empty, because // However, don't bother if the data-src attribute is empty, because
// an empty "src" tag for an image will cause some browsers // an empty "src" tag for an image will cause some browsers
// to prefetch the root page of the Friendica hub, which will // to prefetch the root page of the Friendica hub, which will
// unnecessarily load an entire profile/ or network/ page // unnecessarily load an entire profile/ or network/ page
if($j(el).data("src") != '') $j(el).attr('src', $j(el).data("src")); if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
}); });
} }
notif = eNotif.attr('count'); notif = eNotif.attr('count');
if (notif>0){ if (notif>0){
$j("#nav-notifications-linkmenu").addClass("on"); $("#nav-notifications-linkmenu").addClass("on");
} else { } else {
$j("#nav-notifications-linkmenu").removeClass("on"); $("#nav-notifications-linkmenu").removeClass("on");
} }
if(notif == 0) { notif = ''; $j('#notify-update').removeClass('show') } else { $j('#notify-update').addClass('show') } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
$j('#notify-update').html(notif); $('#notify-update').html(notif);
var eSysmsg = $j(data).find('sysmsgs'); var eSysmsg = $(data).find('sysmsgs');
eSysmsg.children("notice").each(function(){ eSysmsg.children("notice").each(function(){
text = $j(this).text(); text = $(this).text();
$j.jGrowl(text, { sticky: false, theme: 'notice', life: 3000 }); // originally: sticky: true, $.jGrowl(text, { sticky: false, theme: 'notice', life: 3000 }); // originally: sticky: true,
}); });
eSysmsg.children("info").each(function(){ eSysmsg.children("info").each(function(){
text = $j(this).text(); text = $(this).text();
$j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 }); $.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
}); });
}); });
@ -213,7 +213,7 @@
NavUpdate(); NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key // Allow folks to stop the ajax page updates with the pause/break key
$j(document).keydown(function(event) { $(document).keydown(function(event) {
if(event.keyCode == '8') { if(event.keyCode == '8') {
var target = event.target || event.srcElement; var target = event.target || event.srcElement;
if (!/input|textarea/i.test(target.nodeName)) { if (!/input|textarea/i.test(target.nodeName)) {
@ -227,7 +227,7 @@
if (event.ctrlKey) { if (event.ctrlKey) {
totStopped = true; totStopped = true;
} }
$j('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />'); $('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
} else { } else {
unpause(); unpause();
} }
@ -245,28 +245,28 @@
if(! stopped) { if(! stopped) {
var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
$j.get(pingCmd,function(data) { $.get(pingCmd,function(data) {
$j(data).find('result').each(function() { $(data).find('result').each(function() {
// send nav-update event // send nav-update event
$j('nav').trigger('nav-update', this); $('nav').trigger('nav-update', this);
// start live update // start live update
if($j('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($j('#live-community').length) { src = 'community'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
if($j('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); }
/*if($j('#live-display').length) { /*if($('#live-display').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
} }
}*/ }*/
if($j('#live-photos').length) { if($('#live-photos').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
@ -283,8 +283,8 @@
} }
function liveUpdate() { function liveUpdate() {
if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; } if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($j('.comment-edit-text-full').length) || (in_progress)) { if(($('.comment-edit-text-full').length) || (in_progress)) {
if(livetime) { if(livetime) {
clearTimeout(livetime); clearTimeout(livetime);
} }
@ -300,55 +300,55 @@
var udargs = ((netargs.length) ? '/' + netargs : ''); var udargs = ((netargs.length) ? '/' + netargs : '');
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
$j.get(update_url,function(data) { $.get(update_url,function(data) {
in_progress = false; in_progress = false;
// $j('.collapsed-comments',data).each(function() { // $('.collapsed-comments',data).each(function() {
// var ident = $j(this).attr('id'); // var ident = $(this).attr('id');
// var is_hidden = $j('#' + ident).is(':hidden'); // var is_hidden = $('#' + ident).is(':hidden');
// if($j('#' + ident).length) { // if($('#' + ident).length) {
// $j('#' + ident).replaceWith($j(this)); // $('#' + ident).replaceWith($(this));
// if(is_hidden) // if(is_hidden)
// $j('#' + ident).hide(); // $('#' + ident).hide();
// } // }
//}); //});
// add a new thread // add a new thread
$j('.toplevel_item',data).each(function() { $('.toplevel_item',data).each(function() {
var ident = $j(this).attr('id'); var ident = $(this).attr('id');
if($j('#' + ident).length == 0 && profile_page == 1) { if($('#' + ident).length == 0 && profile_page == 1) {
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$j('#' + prev).after($j(this)); $('#' + prev).after($(this));
} }
else { else {
// Find out if the hidden comments are open, so we can keep it that way // Find out if the hidden comments are open, so we can keep it that way
// if a new comment has been posted // if a new comment has been posted
var id = $j('.hide-comments-total', this).attr('id'); var id = $('.hide-comments-total', this).attr('id');
if(typeof id != 'undefined') { if(typeof id != 'undefined') {
id = id.split('-')[3]; id = id.split('-')[3];
var commentsOpen = $j("#collapsed-comments-" + id).is(":visible"); var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
} }
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
//vScroll = $j(document).scrollTop(); //vScroll = $(document).scrollTop();
$j('html').height($j('html').height()); $('html').height($('html').height());
$j('#' + ident).replaceWith($j(this)); $('#' + ident).replaceWith($(this));
if(typeof id != 'undefined') { if(typeof id != 'undefined') {
if(commentsOpen) showHideComments(id); if(commentsOpen) showHideComments(id);
} }
$j('html').height('auto'); $('html').height('auto');
//$j(document).scrollTop(vScroll); //$(document).scrollTop(vScroll);
} }
// Add Colorbox for viewing Network page images // Add Colorbox for viewing Network page images
$j("#" + ident + " .wall-item-body a img").each(function(){ $("#" + ident + " .wall-item-body a img").each(function(){
var aElem = $j(this).parent(); var aElem = $(this).parent();
var imgHref = aElem.attr("href"); var imgHref = aElem.attr("href");
// We need to make sure we only put a Colorbox on links to Friendica images // We need to make sure we only put a Colorbox on links to Friendica images
@ -358,8 +358,8 @@
if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) { if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
// Add a unique class to all the images of a certain post, to allow scrolling through // Add a unique class to all the images of a certain post, to allow scrolling through
var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox"; var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
$j(this).addClass(cBoxClass); $(this).addClass(cBoxClass);
aElem.colorbox({ aElem.colorbox({
maxHeight: '90%', maxHeight: '90%',
@ -376,36 +376,36 @@
/*prev = 'live-' + src; /*prev = 'live-' + src;
$j('.wall-item-outside-wrapper',data).each(function() { $('.wall-item-outside-wrapper',data).each(function() {
var ident = $j(this).attr('id'); var ident = $(this).attr('id');
if($j('#' + ident).length == 0 && prev != 'live-' + src) { if($('#' + ident).length == 0 && prev != 'live-' + src) {
$j('img',this).each(function() { $('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$j('#' + prev).after($j(this)); $('#' + prev).after($(this));
} }
else { else {
$j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
if($j('#' + ident + ' ' + '.comment-edit-text-empty').length) if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
$j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper')); $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total')); $('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
$j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like')); $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
$j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike')); $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
$j('#' + ident + ' ' + '.my-comment-photo').each(function() { $('#' + ident + ' ' + '.my-comment-photo').each(function() {
$j(this).attr('src',$j(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
} }
prev = ident; prev = ident;
});*/ });*/
$j('.like-rotator').hide(); $('.like-rotator').hide();
if(commentBusy) { if(commentBusy) {
commentBusy = false; commentBusy = false;
$j('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
} }
/* autocomplete @nicknames */ /* autocomplete @nicknames */
$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
collapseHeight(); collapseHeight();
@ -419,22 +419,22 @@
if(typeof elems != 'undefined') { if(typeof elems != 'undefined') {
elemName = elems + ' ' + elemName; elemName = elems + ' ' + elemName;
} }
$j(elemName).each(function() { $(elemName).each(function() {
if($j(this).height() > 450) { if($(this).height() > 450) {
$j('html').height($j('html').height()); $('html').height($('html').height());
$j(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 0 }); $(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 0 });
$j(this).addClass('divmore'); $(this).addClass('divmore');
$j('html').height('auto'); $('html').height('auto');
} }
}); });
} }
/*function imgbright(node) { /*function imgbright(node) {
$j(node).removeClass("drophide").addClass("drop"); $(node).removeClass("drophide").addClass("drop");
} }
function imgdull(node) { function imgdull(node) {
$j(node).removeClass("drop").addClass("drophide"); $(node).removeClass("drop").addClass("drophide");
}*/ }*/
// Since our ajax calls are asynchronous, we will give a few // Since our ajax calls are asynchronous, we will give a few
@ -449,28 +449,28 @@
function dolike(ident,verb) { function dolike(ident,verb) {
unpause(); unpause();
$j('#like-rotator-' + ident.toString()).show(); $('#like-rotator-' + ident.toString()).show();
$j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
liking = 1; liking = 1;
} }
function dostar(ident) { function dostar(ident) {
ident = ident.toString(); ident = ident.toString();
// $j('#like-rotator-' + ident).show(); // $('#like-rotator-' + ident).show();
$j.get('starred/' + ident, function(data) { $.get('starred/' + ident, function(data) {
if(data.match(/1/)) { if(data.match(/1/)) {
$j('#starred-' + ident).addClass('starred'); $('#starred-' + ident).addClass('starred');
$j('#starred-' + ident).removeClass('unstarred'); $('#starred-' + ident).removeClass('unstarred');
$j('#star-' + ident).addClass('hidden'); $('#star-' + ident).addClass('hidden');
$j('#unstar-' + ident).removeClass('hidden'); $('#unstar-' + ident).removeClass('hidden');
} }
else { else {
$j('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).addClass('unstarred');
$j('#starred-' + ident).removeClass('starred'); $('#starred-' + ident).removeClass('starred');
$j('#star-' + ident).removeClass('hidden'); $('#star-' + ident).removeClass('hidden');
$j('#unstar-' + ident).addClass('hidden'); $('#unstar-' + ident).addClass('hidden');
} }
// $j('#like-rotator-' + ident).hide(); // $('#like-rotator-' + ident).hide();
}); });
} }
@ -505,31 +505,31 @@
} }
else { else {
lockvisible = true; lockvisible = true;
$j.get('lockview/' + id, function(data) { $.get('lockview/' + id, function(data) {
$j('#panel').html(data); $('#panel').html(data);
$j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5}); $('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
$j('#panel').show(); $('#panel').show();
}); });
} }
} }
function lockviewhide() { function lockviewhide() {
lockvisible = false; lockvisible = false;
$j('#panel').hide(); $('#panel').hide();
} }
function post_comment(id) { function post_comment(id) {
unpause(); unpause();
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j("#comment-preview-inp-" + id).val("0"); $("#comment-preview-inp-" + id).val("0");
$j.post( $.post(
"item", "item",
$j("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.success) { if(data.success) {
$j("#comment-edit-wrapper-" + id).hide(); $("#comment-edit-wrapper-" + id).hide();
$j("#comment-edit-text-" + id).val(''); $("#comment-edit-text-" + id).val('');
var tarea = document.getElementById("comment-edit-text-" + id); var tarea = document.getElementById("comment-edit-text-" + id);
if(tarea) if(tarea)
commentClose(tarea,id); commentClose(tarea,id);
@ -547,16 +547,16 @@
function preview_comment(id) { function preview_comment(id) {
$j("#comment-preview-inp-" + id).val("1"); $("#comment-preview-inp-" + id).val("1");
$j("#comment-edit-preview-" + id).show(); $("#comment-edit-preview-" + id).show();
$j.post( $.post(
"item", "item",
$j("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.preview) { if(data.preview) {
$j("#comment-edit-preview-" + id).html(data.preview); $("#comment-edit-preview-" + id).html(data.preview);
$j("#comment-edit-preview-" + id + " a").click(function() { return false; }); $("#comment-edit-preview-" + id + " a").click(function() { return false; });
} }
}, },
"json" "json"
@ -566,34 +566,34 @@
function showHideComments(id) { function showHideComments(id) {
if( $j("#collapsed-comments-" + id).is(":visible")) { if( $("#collapsed-comments-" + id).is(":visible")) {
$j("#collapsed-comments-" + id).hide(); $("#collapsed-comments-" + id).hide();
$j("#hide-comments-" + id).html(window.showMore); $("#hide-comments-" + id).html(window.showMore);
} }
else { else {
$j("#collapsed-comments-" + id).show(); $("#collapsed-comments-" + id).show();
$j("#hide-comments-" + id).html(window.showFewer); $("#hide-comments-" + id).html(window.showFewer);
collapseHeight("#collapsed-comments-" + id); collapseHeight("#collapsed-comments-" + id);
} }
} }
function preview_post() { function preview_post() {
$j("#jot-preview").val("1"); $("#jot-preview").val("1");
$j("#jot-preview-content").show(); $("#jot-preview-content").show();
tinyMCE.triggerSave(); tinyMCE.triggerSave();
$j.post( $.post(
"item", "item",
$j("#profile-jot-form").serialize(), $("#profile-jot-form").serialize(),
function(data) { function(data) {
if(data.preview) { if(data.preview) {
$j("#jot-preview-content").html(data.preview); $("#jot-preview-content").html(data.preview);
$j("#jot-preview-content" + " a").click(function() { return false; }); $("#jot-preview-content" + " a").click(function() { return false; });
} }
}, },
"json" "json"
); );
$j("#jot-preview").val("0"); $("#jot-preview").val("0");
return true; return true;
} }
@ -602,7 +602,7 @@
// unpause auto reloads if they are currently stopped // unpause auto reloads if they are currently stopped
totStopped = false; totStopped = false;
stopped = false; stopped = false;
$j('#pause').html(''); $('#pause').html('');
} }
@ -630,40 +630,40 @@
} }
function groupChangeMember(gid, cid, sec_token) { function groupChangeMember(gid, cid, sec_token) {
$j('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
$j('#group-update-wrapper').html(data); $('#group-update-wrapper').html(data);
$j('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function profChangeMember(gid,cid) { function profChangeMember(gid,cid) {
$j('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$j.get('profperm/' + gid + '/' + cid, function(data) { $.get('profperm/' + gid + '/' + cid, function(data) {
$j('#prof-update-wrapper').html(data); $('#prof-update-wrapper').html(data);
$j('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function contactgroupChangeMember(gid,cid) { function contactgroupChangeMember(gid,cid) {
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('contactgroup/' + gid + '/' + cid, function(data) { $.get('contactgroup/' + gid + '/' + cid, function(data) {
$j('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
}); });
} }
function checkboxhighlight(box) { function checkboxhighlight(box) {
if($j(box).is(':checked')) { if($(box).is(':checked')) {
$j(box).addClass('checkeditem'); $(box).addClass('checkeditem');
} }
else { else {
$j(box).removeClass('checkeditem'); $(box).removeClass('checkeditem');
} }
} }
function notifyMarkAll() { function notifyMarkAll() {
$j.get('notify/mark/all', function(data) { $.get('notify/mark/all', function(data) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,1000); timer = setTimeout(NavUpdate,1000);
}); });
@ -742,9 +742,9 @@ Array.prototype.remove = function(item) {
}; };
function previewTheme(elm) { function previewTheme(elm) {
theme = $j(elm).val(); theme = $(elm).val();
$j.getJSON('pretheme?f=&theme=' + theme,function(data) { $.getJSON('pretheme?f=&theme=' + theme,function(data) {
$j('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>'); $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
}); });
} }

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
$j(document).ready(function() { $(document).ready(function() {
window.navMenuTimeout = { window.navMenuTimeout = {
'#network-menu-list-timeout': null, '#network-menu-list-timeout': null,
@ -12,83 +12,83 @@ $j(document).ready(function() {
'#system-menu-list-closing': false '#system-menu-list-closing': false
}; };
/* $j.ajaxSetup({ /* $.ajaxSetup({
cache: false cache: false
});*/ });*/
/* enable tinymce on focus and click */ /* enable tinymce on focus and click */
$j("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$j("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
$j('.nav-menu-list, .nav-menu-icon').hover(function() { $('.nav-menu-list, .nav-menu-icon').hover(function() {
showNavMenu($j(this).attr('point')); showNavMenu($(this).attr('point'));
}, function() { }, function() {
hideNavMenu($j(this).attr('point')); hideNavMenu($(this).attr('point'));
}); });
/* $j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/ /* $('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
$j('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
$j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$j(this).removeClass('icon'); $j(this).addClass('iconspacer');} $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$j('.sidebar-group-element').hover( $('.sidebar-group-element').hover(
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');}, $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');} $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
); );
$j('.savedsearchdrop').hover( $('.savedsearchdrop').hover(
function() { function() {
$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');} $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$j('.savedsearchterm').hover( $('.savedsearchterm').hover(
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#drop-' + id).addClass('icon'); $j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');}, $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
function() { function() {
id = $j(this).attr('id'); id = $(this).attr('id');
$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');} $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
); );
/* $j('.nav-load-page-link').click(function() { /* $('.nav-load-page-link').click(function() {
getPageContent( $j(this).attr('href') ); getPageContent( $(this).attr('href') );
hideNavMenu( '#' + $j(this).closest('ul').attr('id') ); hideNavMenu( '#' + $(this).closest('ul').attr('id') );
return false; return false;
});*/ });*/
$j('#event-share-checkbox').change(function() { $('#event-share-checkbox').change(function() {
if ($j('#event-share-checkbox').is(':checked')) { if ($('#event-share-checkbox').is(':checked')) {
$j('#acl-wrapper').show(); $('#acl-wrapper').show();
} }
else { else {
$j('#acl-wrapper').hide(); $('#acl-wrapper').hide();
} }
}).trigger('change'); }).trigger('change');
// For event_end.tpl // For event_end.tpl
/* $j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { /* $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $j(this).text(); selstr = $(this).text();
$j('#jot-public').hide(); $('#jot-public').hide();
}); });
if(selstr == null) { if(selstr == null) {
$j('#jot-public').show(); $('#jot-public').show();
} }
}).trigger('change');*/ }).trigger('change');*/
@ -99,23 +99,23 @@ $j(document).ready(function() {
window.imageUploadButton, window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname, { action: 'wall_upload/'+window.nickname,
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
addeditortext(window.jotId, response); addeditortext(window.jotId, response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );
if($j('#wall-file-upload').length) { if($('#wall-file-upload').length) {
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/'+window.nickname, { action: 'wall_attach/'+window.nickname,
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) { onComplete: function(file,response) {
addeditortext(window.jotId, response); addeditortext(window.jotId, response);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
} }
} }
); );
@ -132,23 +132,23 @@ $j(document).ready(function() {
if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") { if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $j(this).text(); selstr = $(this).text();
$j('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$j('#jot-public').hide(); $('#jot-public').hide();
}); });
if(selstr == null) { if(selstr == null) {
$j('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$j('#jot-public').show(); $('#jot-public').show();
} }
}).trigger('change'); }).trigger('change');
} }
if(window.aclType == "event_head") { if(window.aclType == "event_head") {
$j('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: baseurl + '/events/json/', events: baseurl + '/events/json/',
header: { header: {
left: 'prev,next today', left: 'prev,next today',
@ -198,7 +198,7 @@ $j(document).ready(function() {
// center on date // center on date
var args=location.href.replace(baseurl,"").split("/"); var args=location.href.replace(baseurl,"").split("/");
if (args.length>=4) { if (args.length>=4) {
$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
} }
// show event popup // show event popup
@ -209,17 +209,17 @@ $j(document).ready(function() {
switch(window.autocompleteType) { switch(window.autocompleteType) {
case 'msg-header': case 'msg-header':
var a = $j("#recip").autocomplete({ var a = $("#recip").autocomplete({
serviceUrl: baseurl + '/acl', serviceUrl: baseurl + '/acl',
minChars: 2, minChars: 2,
width: 350, width: 350,
onSelect: function(value,data) { onSelect: function(value,data) {
$j("#recip-complete").val(data); $("#recip-complete").val(data);
} }
}); });
break; break;
case 'contacts-head': case 'contacts-head':
var a = $j("#contacts-search").autocomplete({ var a = $("#contacts-search").autocomplete({
serviceUrl: baseurl + '/acl', serviceUrl: baseurl + '/acl',
minChars: 2, minChars: 2,
width: 350, width: 350,
@ -227,23 +227,23 @@ $j(document).ready(function() {
a.setOptions({ params: { type: 'a' }}); a.setOptions({ params: { type: 'a' }});
break; break;
case 'display-head': case 'display-head':
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
break; break;
default: default:
break; break;
} }
/* if(window.autoCompleteType == "display-head") { /* if(window.autoCompleteType == "display-head") {
//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); //$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places // make auto-complete work in more places
//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); //$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}*/ }*/
// Add Colorbox for viewing Network page images // Add Colorbox for viewing Network page images
//var cBoxClasses = new Array(); //var cBoxClasses = new Array();
$j(".wall-item-body a img").each(function(){ $(".wall-item-body a img").each(function(){
var aElem = $j(this).parent(); var aElem = $(this).parent();
var imgHref = aElem.attr("href"); var imgHref = aElem.attr("href");
// We need to make sure we only put a Colorbox on links to Friendica images // We need to make sure we only put a Colorbox on links to Friendica images
@ -253,22 +253,22 @@ $j(document).ready(function() {
if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) { if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
// Add a unique class to all the images of a certain post, to allow scrolling through // Add a unique class to all the images of a certain post, to allow scrolling through
var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox"; var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
$j(this).addClass(cBoxClass); $(this).addClass(cBoxClass);
// if( $j.inArray(cBoxClass, cBoxClasses) < 0 ) { // if( $.inArray(cBoxClass, cBoxClasses) < 0 ) {
// cBoxClasses.push(cBoxClass); // cBoxClasses.push(cBoxClass);
// } // }
aElem.colorbox({ aElem.colorbox({
maxHeight: '90%', maxHeight: '90%',
photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
rel: cBoxClass //$j(this).attr("class").match(/wall-item-body-[\d]+-lightbox/)[0] rel: cBoxClass //$(this).attr("class").match(/wall-item-body-[\d]+-lightbox/)[0]
}); });
} }
}); });
/*$j.each(cBoxClasses, function(){ /*$.each(cBoxClasses, function(){
$j('.'+this).colorbox({ $('.'+this).colorbox({
maxHeight: '90%', maxHeight: '90%',
photo: true, photo: true,
rel: this rel: this
@ -279,41 +279,41 @@ $j(document).ready(function() {
// update pending count // // update pending count //
$j(function(){ $(function(){
$j("nav").bind('nav-update', function(e,data){ $("nav").bind('nav-update', function(e,data){
var elm = $j('#pending-update'); var elm = $('#pending-update');
var register = $j(data).find('register').text(); var register = $(data).find('register').text();
if (register=="0") { register=""; elm.hide();} else { elm.show(); } if (register=="0") { register=""; elm.hide();} else { elm.show(); }
elm.html(register); elm.html(register);
}); });
}); });
$j(function(){ $(function(){
$j("#cnftheme").click(function(){ $("#cnftheme").click(function(){
$.colorbox({ $.colorbox({
width: 800, width: 800,
height: '90%', height: '90%',
href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(), href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(),
onComplete: function(){ onComplete: function(){
$j("div#fancybox-content form").submit(function(e){ $("div#fancybox-content form").submit(function(e){
var url = $j(this).attr('action'); var url = $(this).attr('action');
// can't get .serialize() to work... // can't get .serialize() to work...
var data={}; var data={};
$j(this).find("input").each(function(){ $(this).find("input").each(function(){
data[$j(this).attr('name')] = $j(this).val(); data[$(this).attr('name')] = $(this).val();
}); });
$j(this).find("select").each(function(){ $(this).find("select").each(function(){
data[$j(this).attr('name')] = $j(this).children(":selected").val(); data[$(this).attr('name')] = $(this).children(":selected").val();
}); });
console.log(":)", url, data); console.log(":)", url, data);
$j.post(url, data, function(data) { $.post(url, data, function(data) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
NavUpdate(); NavUpdate();
$j.colorbox.close(); $.colorbox.close();
}) })
return false; return false;
@ -327,7 +327,7 @@ $j(function(){
function homeRedirect() { function homeRedirect() {
$j('html').fadeOut('slow', function(){ $('html').fadeOut('slow', function(){
window.location = baseurl + "/login"; window.location = baseurl + "/login";
}); });
} }
@ -335,7 +335,7 @@ function homeRedirect() {
if(typeof window.photoEdit != 'undefined') { if(typeof window.photoEdit != 'undefined') {
$j(document).keydown(function(event) { $(document).keydown(function(event) {
if(window.prevLink != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }} if(window.prevLink != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }}
if(window.nextLink != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }} if(window.nextLink != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }}
@ -344,23 +344,23 @@ if(typeof window.photoEdit != 'undefined') {
} }
function showEvent(eventid) { function showEvent(eventid) {
$j.get( $.get(
baseurl + '/events/?id='+eventid, baseurl + '/events/?id='+eventid,
function(data){ function(data){
$j.colorbox({html:data}); $.colorbox({html:data});
$j.colorbox.resize(); $.colorbox.resize();
} }
); );
} }
function initCrop() { function initCrop() {
function onEndCrop( coords, dimensions ) { function onEndCrop( coords, dimensions ) {
$( 'x1' ).value = coords.x1; $PR( 'x1' ).value = coords.x1;
$( 'y1' ).value = coords.y1; $PR( 'y1' ).value = coords.y1;
$( 'x2' ).value = coords.x2; $PR( 'x2' ).value = coords.x2;
$( 'y2' ).value = coords.y2; $PR( 'y2' ).value = coords.y2;
$( 'width' ).value = dimensions.width; $PR( 'width' ).value = dimensions.width;
$( 'height' ).value = dimensions.height; $PR( 'height' ).value = dimensions.height;
} }
Event.observe( window, 'load', function() { Event.observe( window, 'load', function() {
@ -381,14 +381,14 @@ function initCrop() {
/* /*
$j(document).mouseup(function (clickPos) { $(document).mouseup(function (clickPos) {
var sysMenu = $j("#system-menu-list"); var sysMenu = $("#system-menu-list");
var sysMenuLink = $j(".system-menu-link"); var sysMenuLink = $(".system-menu-link");
var contactsMenu = $j("#contacts-menu-list"); var contactsMenu = $("#contacts-menu-list");
var contactsMenuLink = $j(".contacts-menu-link"); var contactsMenuLink = $(".contacts-menu-link");
var networkMenu = $j("#network-menu-list"); var networkMenu = $("#network-menu-list");
var networkMenuLink = $j(".network-menu-link"); var networkMenuLink = $(".network-menu-link");
if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) { if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) {
hideNavMenu("#system-menu-list"); hideNavMenu("#system-menu-list");
@ -404,20 +404,20 @@ $j(document).mouseup(function (clickPos) {
function getPageContent(url) { function getPageContent(url) {
var pos = $j('.main-container').position(); var pos = $('.main-container').position();
$j('.main-container').css('margin-left', pos.left); $('.main-container').css('margin-left', pos.left);
$j('.main-content-container').hide(0, function () { $('.main-content-container').hide(0, function () {
$j('.main-content-loading').show(0); $('.main-content-loading').show(0);
}); });
$j.get(url, function(html) { $.get(url, function(html) {
console.log($j('.main-content-container').html()); console.log($('.main-content-container').html());
$j('.main-content-container').html( $j('.main-content-container', html).html() ); $('.main-content-container').html( $('.main-content-container', html).html() );
console.log($j('.main-content-container').html()); console.log($('.main-content-container').html());
$j('.main-content-loading').hide(function() { $('.main-content-loading').hide(function() {
$j('.main-content-container').fadeIn(800,function() { $('.main-content-container').fadeIn(800,function() {
$j('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong $('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
}); });
}); });
}); });
@ -434,7 +434,7 @@ function showNavMenu(menuID) {
window.navMenuTimeout[menuID + '-opening'] = true; window.navMenuTimeout[menuID + '-opening'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
$j(menuID).slideDown('fast').show(); $(menuID).slideDown('fast').show();
window.navMenuTimeout[menuID + '-opening'] = false; window.navMenuTimeout[menuID + '-opening'] = false;
}, 200); }, 200);
} }
@ -450,7 +450,7 @@ function hideNavMenu(menuID) {
window.navMenuTimeout[menuID + '-closing'] = true; window.navMenuTimeout[menuID + '-closing'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
$j(menuID).slideUp('fast'); $(menuID).slideUp('fast');
window.navMenuTimeout[menuID + '-closing'] = false; window.navMenuTimeout[menuID + '-closing'] = false;
}, 500); }, 500);
} }
@ -491,7 +491,7 @@ function InitMCEEditor(editorData) {
}; };
if(window.editSelect != 'none') { if(window.editSelect != 'none') {
$j.extend(tinyMCEInitConfig, editorData); $.extend(tinyMCEInitConfig, editorData);
tinyMCE.init(tinyMCEInitConfig); tinyMCE.init(tinyMCEInitConfig);
} }
else if(typeof editorData.plaintextFn == 'function') { else if(typeof editorData.plaintextFn == 'function') {
@ -505,7 +505,7 @@ var textlen = 0;
function initEditor(cb){ function initEditor(cb){
if(editor==false) { if(editor==false) {
editor = true; editor = true;
$j("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
var editorData = { var editorData = {
mode : "specific_textareas", mode : "specific_textareas",
@ -536,53 +536,53 @@ function initEditor(cb){
} }
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) { if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$j('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
else { else {
$j('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
//Character count //Character count
if(textlen <= 140) { if(textlen <= 140) {
$j('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$j('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$j('#character-counter').addClass('grey'); $('#character-counter').addClass('grey');
} }
if((textlen > 140) && (textlen <= 420)) { if((textlen > 140) && (textlen <= 420)) {
$j('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$j('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$j('#character-counter').addClass('orange'); $('#character-counter').addClass('orange');
} }
if(textlen > 420) { if(textlen > 420) {
$j('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$j('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$j('#character-counter').addClass('red'); $('#character-counter').addClass('red');
} }
$j('#character-counter').text(textlen); $('#character-counter').text(textlen);
}); });
ed.onInit.add(function(ed) { ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true; ed.pasteAsPlainText = true;
$j("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$j(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
}); });
}, },
plaintextFn : function() { plaintextFn : function() {
$j("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$j(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
} }
}; };
InitMCEEditor(editorData); InitMCEEditor(editorData);
// setup acl popup // setup acl popup
$j("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
}); });
@ -593,7 +593,7 @@ function initEditor(cb){
function enableOnUser(){ function enableOnUser(){
if (editor) return; if (editor) return;
$j(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
@ -628,26 +628,26 @@ function msgInitEditor() {
} }
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) { if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$j('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
else { else {
$j('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
}); });
ed.onInit.add(function(ed) { ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true; ed.pasteAsPlainText = true;
var editorId = ed.editorId; var editorId = ed.editorId;
var textarea = $j('#'+editorId); var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") { if (typeof(textarea.attr('tabindex')) != "undefined") {
$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null); textarea.attr('tabindex', null);
} }
}); });
}, },
plaintextFn : function() { plaintextFn : function() {
$j("#prvmail-text").contact_autocomplete(baseurl+"/acl"); $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
} }
} }
InitMCEEditor(editorData); InitMCEEditor(editorData);
@ -702,8 +702,8 @@ function profInitEditor() {
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') { if(window.editSelect == 'none') {
var currentText = $j(textElem).val(); var currentText = $(textElem).val();
$j(textElem).val(currentText + data); $(textElem).val(currentText + data);
} }
else else
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);
@ -732,7 +732,7 @@ function jotGetLocation() {
var lat = position.coords.latitude; var lat = position.coords.latitude;
var lng = position.coords.longitude; var lng = position.coords.longitude;
$j.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng, url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
jsonp: 'json_callback', jsonp: 'json_callback',
@ -741,45 +741,45 @@ function jotGetLocation() {
success: function(json) { success: function(json) {
console.log(json); console.log(json);
var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state; var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
$j('#jot-location').val(locationDisplay); $('#jot-location').val(locationDisplay);
$j('#jot-display-location').html('Location: '+locationDisplay); $('#jot-display-location').html('Location: '+locationDisplay);
$j('#jot-display-location').show(); $('#jot-display-location').show();
} }
}); });
}); });
} }
else { else {
reply = prompt(window.whereAreU, $j('#jot-location').val()); reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$j('#jot-location').val(reply); $('#jot-location').val(reply);
} }
}*/ }*/
reply = prompt(window.whereAreU, $j('#jot-location').val()); reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$j('#jot-location').val(reply); $('#jot-location').val(reply);
} }
} }
function jotShare(id) { function jotShare(id) {
if ($j('#jot-popup').length != 0) $j('#jot-popup').show(); if ($('#jot-popup').length != 0) $('#jot-popup').show();
$j('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$j.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $j("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
addeditortext("#profile-jot-text", data); addeditortext("#profile-jot-text", data);
$j('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
$j(window).scrollTop(0); $(window).scrollTop(0);
}); });
}); });
} }
function jotClearLocation() { function jotClearLocation() {
$j('#jot-coord').val(''); $('#jot-coord').val('');
$j('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();
} }
@ -787,10 +787,10 @@ function jotGetLink() {
reply = prompt(window.linkURL); reply = prompt(window.linkURL);
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$j('#profile-rotator').show(); $('#profile-rotator').show();
$j.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
addeditortext(window.jotId, data); addeditortext(window.jotId, data);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });
} }
} }
@ -809,18 +809,18 @@ function linkdrop(event) {
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$j('#profile-rotator').show(); $('#profile-rotator').show();
$j.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
/* if(window.jotId == "#profile-jot-text") { /* if(window.jotId == "#profile-jot-text") {
if (!editor) $j("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
addeditortext(window.jotId, data); addeditortext(window.jotId, data);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });
} }
else {*/ else {*/
addeditortext(window.jotId, data); addeditortext(window.jotId, data);
$j('#profile-rotator').hide(); $('#profile-rotator').hide();
// } // }
}); });
} }
@ -840,19 +840,19 @@ function deleteCheckedItems(delID) {
if(confirm(window.delItems)) { if(confirm(window.delItems)) {
var checkedstr = ''; var checkedstr = '';
$j(delID).hide(); $(delID).hide();
$j(delID + '-rotator').show(); $(delID + '-rotator').show();
$j('.item-select').each( function() { $('.item-select').each( function() {
if($j(this).is(':checked')) { if($(this).is(':checked')) {
if(checkedstr.length != 0) { if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $j(this).val(); checkedstr = checkedstr + ',' + $(this).val();
} }
else { else {
checkedstr = $j(this).val(); checkedstr = $(this).val();
} }
} }
}); });
$j.post('item', { dropitems: checkedstr }, function(data) { $.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload(); window.location.reload();
}); });
} }
@ -865,9 +865,9 @@ function itemTag(id) {
if(reply.length) { if(reply.length) {
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('tagger/' + id + '?term=' + reply, NavUpdate); $.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer); /*if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
@ -877,31 +877,31 @@ function itemTag(id) {
function itemFiler(id) { function itemFiler(id) {
var bordercolor = $j("input").css("border-color"); var bordercolor = $("input").css("border-color");
$j.get('filer/', function(data){ $.get('filer/', function(data){
$j.colorbox({html:data}); $.colorbox({html:data});
$j.colorbox.resize(); $.colorbox.resize();
$j("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
$j("#select_term").change(function(){ $("#select_term").change(function(){
$j("#id_term").css("border-color",bordercolor); $("#id_term").css("border-color",bordercolor);
}) })
$j("#filer_save").click(function(e){ $("#filer_save").click(function(e){
e.preventDefault(); e.preventDefault();
reply = $j("#id_term").val(); reply = $("#id_term").val();
if(reply && reply.length) { if(reply && reply.length) {
commentBusy = true; commentBusy = true;
$j('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$j.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer); /* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
$j.colorbox.close(); $.colorbox.close();
} else { } else {
$j("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }
return false; return false;
}); });
@ -916,13 +916,13 @@ function itemFiler(id) {
function insertFormatting(comment,BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
$j("#comment-edit-text-" + id).val(tmpStr); $("#comment-edit-text-" + id).val(tmpStr);
} }
textarea = document.getElementById("comment-edit-text-" +id); textarea = document.getElementById("comment-edit-text-" +id);
@ -945,71 +945,71 @@ function insertFormatting(comment,BBcode,id) {
} }
function cmtBbOpen(id) { function cmtBbOpen(id) {
$j("#comment-edit-bb-" + id).show(); $("#comment-edit-bb-" + id).show();
} }
function cmtBbClose(id) { function cmtBbClose(id) {
$j("#comment-edit-bb-" + id).hide(); $("#comment-edit-bb-" + id).hide();
} }
function commentOpen(obj,id) { function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) { if(obj.value == window.commentEmptyText) {
obj.value = ""; obj.value = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$j("#mod-cmnt-wrap-" + id).show(); $("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
} }
function commentClose(obj,id) { function commentClose(obj,id) {
if(obj.value == "") { if(obj.value == "") {
obj.value = window.commentEmptyText; obj.value = window.commentEmptyText;
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$j("#mod-cmnt-wrap-" + id).hide(); $("#mod-cmnt-wrap-" + id).hide();
closeMenu("comment-edit-submit-wrapper-" + id); closeMenu("comment-edit-submit-wrapper-" + id);
} }
} }
function commentInsert(obj,id) { function commentInsert(obj,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) { if(tmpStr == window.commentEmptyText) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $j(obj).html(); var ins = $(obj).html();
ins = ins.replace("&lt;","<"); ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">"); ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&"); ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;",'"'); ins = ins.replace("&quot;",'"');
$j("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
} }
function qCommentInsert(obj,id) { function qCommentInsert(obj,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) { if(tmpStr == window.commentEmptyText) {
tmpStr = ""; tmpStr = "";
$j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $j(obj).val(); var ins = $(obj).val();
ins = ins.replace("&lt;","<"); ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">"); ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&"); ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;",'"'); ins = ins.replace("&quot;",'"');
$j("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
$j(obj).val(""); $(obj).val("");
} }
/*function showHideCommentBox(id) { /*function showHideCommentBox(id) {
if( $j('#comment-edit-form-' + id).is(':visible')) { if( $('#comment-edit-form-' + id).is(':visible')) {
$j('#comment-edit-form-' + id).hide(); $('#comment-edit-form-' + id).hide();
} }
else { else {
$j('#comment-edit-form-' + id).show(); $('#comment-edit-form-' + id).show();
} }
}*/ }*/

File diff suppressed because one or more lines are too long

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script> <script>
function confirm_delete(uname){ function confirm_delete(uname){
return confirm( "{{$confirm_delete}}".format(uname)); return confirm( "{{$confirm_delete}}".format(uname));
@ -11,7 +6,7 @@
return confirm("{{$confirm_delete_multi}}"); return confirm("{{$confirm_delete_multi}}");
} }
function selectall(cls){ function selectall(cls){
$j("."+cls).attr('checked','checked'); $("."+cls).attr('checked','checked');
return false; return false;
} }
</script> </script>

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p id="cropimage-desc"> <p id="cropimage-desc">
{{$desc}} {{$desc}}

View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
<script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

View file

@ -1,6 +1 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" /> <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

View file

@ -20,8 +20,6 @@
{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}} {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script> <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>

View file

@ -1,16 +1,11 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
if(navigator.geolocation) { if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) { navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4); var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4); var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon); $('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show(); $('#profile-nolocation-wrapper').show();
}); });
} }

View file

@ -1,7 +1,2 @@
{{* <script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>

View file

@ -26,7 +26,7 @@ function frost_content_loaded(&$a) {
$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost/login-style.css'; $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost/login-style.css';
} }
if( $a->module === 'login' ) if( $a->module === 'login' )
$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>'; $a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
} }