From 127b7a589efe0d4b9af498f9c274f9bcd07700ab Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sat, 1 Jun 2013 10:42:51 -0600 Subject: [PATCH 1/2] eliminate Cropper conflicts with jQuery --- library/cropper/cropper.html | 12 +- library/cropper/cropper.js | 1098 +++++++++-------- library/cropper/cropper.uncompressed.js | 34 +- library/cropper/lib/controls.js | 14 +- library/cropper/lib/dragdrop.js | 34 +- library/cropper/lib/effects.js | 66 +- library/cropper/lib/prototype.js | 104 +- library/cropper/lib/slider.js | 14 +- library/cropper/lib/unittest.js | 16 +- library/cropper/tests/example-Basic.htm | 12 +- .../cropper/tests/example-CSS-Absolute.htm | 12 +- library/cropper/tests/example-CSS-Float.htm | 24 +- .../cropper/tests/example-CSS-Relative.htm | 12 +- .../cropper/tests/example-CoordsOnLoad.htm | 12 +- .../tests/example-CoordsOnLoadWithRatio.htm | 12 +- library/cropper/tests/example-Dimensions.htm | 12 +- .../cropper/tests/example-DynamicImage.htm | 26 +- library/cropper/tests/example-FixedRatio.htm | 12 +- .../tests/example-MinimumDimensions.htm | 12 +- .../cropper/tests/example-MinimumWidth.htm | 12 +- library/cropper/tests/example-Preview.htm | 12 +- util/minifyjs.sh | 2 - view/templates/cropbody.tpl | 17 +- view/templates/crophead.tpl | 5 - view/templates/field_combobox.tpl | 5 - view/templates/field_input.tpl | 7 +- view/templates/field_openid.tpl | 7 +- view/templates/field_password.tpl | 7 +- view/templates/login_head.tpl | 5 - view/templates/posted_date_widget.tpl | 5 - view/theme/decaf-mobile/js/theme.js | 16 +- view/theme/decaf-mobile/js/theme.min.js | 2 +- .../decaf-mobile/templates/admin_users.tpl | 7 +- .../theme/decaf-mobile/templates/cropbody.tpl | 5 - view/theme/decaf-mobile/templates/cropend.tpl | 5 - .../theme/decaf-mobile/templates/crophead.tpl | 5 - view/theme/decaf-mobile/templates/end.tpl | 2 - .../decaf-mobile/templates/field_input.tpl | 5 - .../decaf-mobile/templates/jot_geotag.tpl | 9 +- .../templates/settings_display_end.tpl | 7 +- view/theme/decaf-mobile/theme.php | 2 +- view/theme/frost-mobile/js/acl.js | 82 +- view/theme/frost-mobile/js/acl.min.js | 2 +- view/theme/frost-mobile/js/main.js | 384 +++--- view/theme/frost-mobile/js/main.min.js | 2 +- view/theme/frost-mobile/js/theme.js | 318 ++--- view/theme/frost-mobile/js/theme.min.js | 2 +- .../frost-mobile/templates/admin_users.tpl | 7 +- .../theme/frost-mobile/templates/cropbody.tpl | 5 - view/theme/frost-mobile/templates/cropend.tpl | 5 - .../theme/frost-mobile/templates/crophead.tpl | 5 - view/theme/frost-mobile/templates/end.tpl | 6 - .../frost-mobile/templates/field_input.tpl | 5 - .../frost-mobile/templates/field_openid.tpl | 5 - .../frost-mobile/templates/field_password.tpl | 5 - .../frost-mobile/templates/jot_geotag.tpl | 9 +- .../templates/settings_display_end.tpl | 7 +- view/theme/frost-mobile/theme.php | 2 +- view/theme/frost/js/acl.js | 82 +- view/theme/frost/js/acl.min.js | 2 +- view/theme/frost/js/main.js | 380 +++--- view/theme/frost/js/main.min.js | 2 +- view/theme/frost/js/theme.js | 428 +++---- view/theme/frost/js/theme.min.js | 2 +- view/theme/frost/templates/admin_users.tpl | 7 +- view/theme/frost/templates/cropbody.tpl | 5 - view/theme/frost/templates/cropend.tpl | 5 - view/theme/frost/templates/crophead.tpl | 5 - view/theme/frost/templates/end.tpl | 2 - view/theme/frost/templates/jot_geotag.tpl | 9 +- .../frost/templates/settings_display_end.tpl | 7 +- view/theme/frost/theme.php | 2 +- 72 files changed, 1659 insertions(+), 1817 deletions(-) diff --git a/library/cropper/cropper.html b/library/cropper/cropper.html index 2362352474..ebdf1ffc26 100644 --- a/library/cropper/cropper.html +++ b/library/cropper/cropper.html @@ -40,17 +40,17 @@ JavaScript: 1. function onEndCrop( coords, dimensions ) { 2. - $( 'x1' ).value = coords.x1; + $PR( 'x1' ).value = coords.x1; 3. - $( 'y1' ).value = coords.y1; + $PR( 'y1' ).value = coords.y1; 4. - $( 'x2' ).value = coords.x2; + $PR( 'x2' ).value = coords.x2; 5. - $( 'y2' ).value = coords.y2; + $PR( 'y2' ).value = coords.y2; 6. - $( 'width' ).value = dimensions.width; + $PR( 'width' ).value = dimensions.width; 7. - $( 'height' ).value = dimensions.height; + $PR( 'height' ).value = dimensions.height; 8. } diff --git a/library/cropper/cropper.js b/library/cropper/cropper.js index 486a92ad91..427a9ba0a2 100644 --- a/library/cropper/cropper.js +++ b/library/cropper/cropper.js @@ -13,554 +13,556 @@ * http://www.opensource.org/licenses/bsd-license.php * * 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(); -Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){ -this.options=Object.extend({drawMethod:function(){ -}},arguments[1]||{}); -this.element=$(_1); -this.handle=this.element; -this.delta=this.currentDelta(); -this.dragging=false; -this.eventMouseDown=this.initDrag.bindAsEventListener(this); -Event.observe(this.handle,"mousedown",this.eventMouseDown); -Draggables.register(this); -},draw:function(_2){ -var _3=Position.cumulativeOffset(this.element); -var d=this.currentDelta(); -_3[0]-=d[0]; -_3[1]-=d[1]; -var p=[0,1].map(function(i){ -return (_2[i]-_3[i]-this.offset[i]); -}.bind(this)); -this.options.drawMethod(p); -}}); -var Cropper={}; -Cropper.Img=Class.create(); -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.img=$(_7); -this.clickCoords={x:0,y:0}; -this.dragging=false; -this.resizing=false; -this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent); -this.isIE=/MSIE/.test(navigator.userAgent); -this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent); -this.ratioX=0; -this.ratioY=0; -this.attached=false; -this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth)); -this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight)); -if(typeof this.img=="undefined"){ -return; -} -$A(document.getElementsByTagName("script")).each(function(s){ -if(s.src.match(/cropper\.js/)){ -var _a=s.src.replace(/cropper\.js(.*)?/,""); -var _b=document.createElement("link"); -_b.rel="stylesheet"; -_b.type="text/css"; -_b.href=_a+"cropper.css"; -_b.media="screen"; -document.getElementsByTagName("head")[0].appendChild(_b); -} -}); -if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){ -var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y); -this.ratioX=this.options.ratioDim.x/_c; -this.ratioY=this.options.ratioDim.y/_c; -} -this.subInitialize(); -if(this.img.complete||this.isWebKit){ -this.onLoad(); -}else{ -Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this)); -} -},getGCD:function(a,b){ -if(b==0){ -return a; -} -return this.getGCD(b,a%b); -},onLoad:function(){ -var _f="imgCrop_"; -var _10=this.img.parentNode; -var _11=""; -if(this.isOpera8){ -_11=" opera8"; -} -this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11}); -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.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")]); -var _12=[this.north,this.east,this.south,this.west]; -this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12); -this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"}); -this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"}); -this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"}); -this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"}); -this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"}); -this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"}); -this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"}); -this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"}); -this.selArea=Builder.node("div",{"class":_f+"selArea"},[Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeNorth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeEast"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeSouth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeWest"},[Builder.node("span")]),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,Builder.node("div",{"class":_f+"clickArea"})]); -this.imgWrap.appendChild(this.img); -this.imgWrap.appendChild(this.dragArea); -this.dragArea.appendChild(this.selArea); -this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"})); -_10.appendChild(this.imgWrap); -this.startDragBind=this.startDrag.bindAsEventListener(this); -Event.observe(this.dragArea,"mousedown",this.startDragBind); -this.onDragBind=this.onDrag.bindAsEventListener(this); -Event.observe(document,"mousemove",this.onDragBind); -this.endCropBind=this.endCrop.bindAsEventListener(this); -Event.observe(document,"mouseup",this.endCropBind); -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.registerHandles(true); -if(this.options.captureKeys){ -this.keysBind=this.handleKeys.bindAsEventListener(this); -Event.observe(document,"keypress",this.keysBind); -} -new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)}); -this.setParams(); -},registerHandles:function(_13){ -for(var i=0;i0&&this.options.ratioDim.y>0){ -_1a.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2); -_1a.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2); -_1a.x2=_1a.x1+this.options.ratioDim.x; -_1a.y2=_1a.y1+this.options.ratioDim.y; -_1b=true; -} -} -this.setAreaCoords(_1a,false,false,1); -if(this.options.displayOnInit&&_1b){ -this.selArea.show(); -this.drawArea(); -this.endCrop(); -} -this.attached=true; -},remove:function(){ -if(this.attached){ -this.attached=false; -this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap); -this.imgWrap.parentNode.removeChild(this.imgWrap); -Event.stopObserving(this.dragArea,"mousedown",this.startDragBind); -Event.stopObserving(document,"mousemove",this.onDragBind); -Event.stopObserving(document,"mouseup",this.endCropBind); -this.registerHandles(false); -if(this.options.captureKeys){ -Event.stopObserving(document,"keypress",this.keysBind); -} -} -},reset:function(){ -if(!this.attached){ -this.onLoad(); -}else{ -this.setParams(); -} -this.endCrop(); -},handleKeys:function(e){ -var dir={x:0,y:0}; -if(!this.dragging){ -switch(e.keyCode){ -case (37): -dir.x=-1; -break; -case (38): -dir.y=-1; -break; -case (39): -dir.x=1; -break; -case (40): -dir.y=1; -break; -} -if(dir.x!=0||dir.y!=0){ -if(e.shiftKey){ -dir.x*=10; -dir.y*=10; -} -this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]); -Event.stop(e); -} -} -},calcW:function(){ -return (this.areaCoords.x2-this.areaCoords.x1); -},calcH:function(){ -return (this.areaCoords.y2-this.areaCoords.y1); -},moveArea:function(_1e){ -this.setAreaCoords({x1:_1e[0],y1:_1e[1],x2:_1e[0]+this.calcW(),y2:_1e[1]+this.calcH()},true,false); -this.drawArea(); -},cloneCoords:function(_1f){ -return {x1:_1f.x1,y1:_1f.y1,x2:_1f.x2,y2:_1f.y2}; -},setAreaCoords:function(_20,_21,_22,_23,_24){ -if(_21){ -var _25=_20.x2-_20.x1; -var _26=_20.y2-_20.y1; -if(_20.x1<0){ -_20.x1=0; -_20.x2=_25; -} -if(_20.y1<0){ -_20.y1=0; -_20.y2=_26; -} -if(_20.x2>this.imgW){ -_20.x2=this.imgW; -_20.x1=this.imgW-_25; -} -if(_20.y2>this.imgH){ -_20.y2=this.imgH; -_20.y1=this.imgH-_26; -} -}else{ -if(_20.x1<0){ -_20.x1=0; -} -if(_20.y1<0){ -_20.y1=0; -} -if(_20.x2>this.imgW){ -_20.x2=this.imgW; -} -if(_20.y2>this.imgH){ -_20.y2=this.imgH; -} -if(_23!=null){ -if(this.ratioX>0){ -this.applyRatio(_20,{x:this.ratioX,y:this.ratioY},_23,_24); -}else{ -if(_22){ -this.applyRatio(_20,{x:1,y:1},_23,_24); -} -} -var _27=[this.options.minWidth,this.options.minHeight]; -var _28=[this.options.maxWidth,this.options.maxHeight]; -if(_27[0]>0||_27[1]>0||_28[0]>0||_28[1]>0){ -var _29={a1:_20.x1,a2:_20.x2}; -var _2a={a1:_20.y1,a2:_20.y2}; -var _2b={min:0,max:this.imgW}; -var _2c={min:0,max:this.imgH}; -if((_27[0]!=0||_27[1]!=0)&&_22){ -if(_27[0]>0){ -_27[1]=_27[0]; -}else{ -if(_27[1]>0){ -_27[0]=_27[1]; -} -} -} -if((_28[0]!=0||_28[0]!=0)&&_22){ -if(_28[0]>0&&_28[0]<=_28[1]){ -_28[1]=_28[0]; -}else{ -if(_28[1]>0&&_28[1]<=_28[0]){ -_28[0]=_28[1]; -} -} -} -if(_27[0]>0){ -this.applyDimRestriction(_29,_27[0],_23.x,_2b,"min"); -} -if(_27[1]>1){ -this.applyDimRestriction(_2a,_27[1],_23.y,_2c,"min"); -} -if(_28[0]>0){ -this.applyDimRestriction(_29,_28[0],_23.x,_2b,"max"); -} -if(_28[1]>1){ -this.applyDimRestriction(_2a,_28[1],_23.y,_2c,"max"); -} -_20={x1:_29.a1,y1:_2a.a1,x2:_29.a2,y2:_2a.a2}; -} -} -} -this.areaCoords=_20; -},applyDimRestriction:function(_2d,val,_2f,_30,_31){ -var _32; -if(_31=="min"){ -_32=((_2d.a2-_2d.a1)val); -} -if(_32){ -if(_2f==1){ -_2d.a2=_2d.a1+val; -}else{ -_2d.a1=_2d.a2-val; -} -if(_2d.a1<_30.min){ -_2d.a1=_30.min; -_2d.a2=val; -}else{ -if(_2d.a2>_30.max){ -_2d.a1=_30.max-val; -_2d.a2=_30.max; -} -} -} -},applyRatio:function(_33,_34,_35,_36){ -var _37; -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}); -_33.x1=_37.b1; -_33.y1=_37.a1; -_33.x2=_37.b2; -_33.y2=_37.a2; -}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}); -_33.x1=_37.a1; -_33.y1=_37.b1; -_33.x2=_37.a2; -_33.y2=_37.b2; -} -},applyRatioToAxis:function(_38,_39,_3a,_3b){ -var _3c=Object.extend(_38,{}); -var _3d=_3c.a2-_3c.a1; -var _3e=Math.floor(_3d*_39.b/_39.a); -var _3f; -var _40; -var _41=null; -if(_3a.b==1){ -_3f=_3c.b1+_3e; -if(_3f>_3b.max){ -_3f=_3b.max; -_41=_3f-_3c.b1; -} -_3c.b2=_3f; -}else{ -_3f=_3c.b2-_3e; -if(_3f<_3b.min){ -_3f=_3b.min; -_41=_3f+_3c.b2; -} -_3c.b1=_3f; -} -if(_41!=null){ -_40=Math.floor(_41*_39.a/_39.b); -if(_3a.a==1){ -_3c.a2=_3c.a1+_40; -}else{ -_3c.a1=_3c.a1=_3c.a2-_40; -} -} -return _3c; -},drawArea:function(){ -var _42=this.calcW(); -var _43=this.calcH(); -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 _46=this.selArea.style; -_46.left=_45[0]; -_46.top=_45[1]; -_46.width=_45[2]; -_46.height=_45[3]; -var _47=Math.ceil((_42-6)/2)+px; -var _48=Math.ceil((_43-6)/2)+px; -this.handleN.style.left=_47; -this.handleE.style.top=_48; -this.handleS.style.left=_47; -this.handleW.style.top=_48; -this.north.style.height=_45[1]; -var _49=this.east.style; -_49.top=_45[1]; -_49.height=_45[3]; -_49.left=_45[4]; -_49.width=_45[6]; -var _4a=this.south.style; -_4a.top=_45[5]; -_4a.height=_45[7]; -var _4b=this.west.style; -_4b.top=_45[1]; -_4b.height=_45[3]; -_4b.width=_45[0]; -this.subDrawArea(); -this.forceReRender(); -},forceReRender:function(){ -if(this.isIE||this.isWebKit){ -var n=document.createTextNode(" "); -var d,el,fixEL,i; -if(this.isIE){ -fixEl=this.selArea; -}else{ -if(this.isWebKit){ -fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0]; -d=Builder.node("div",""); -d.style.visibility="hidden"; -var _4e=["SE","S","SW"]; -for(i=0;i<_4e.length;i++){ -el=document.getElementsByClassName("imgCrop_handle"+_4e[i],this.selArea)[0]; -if(el.childNodes.length){ -el.removeChild(el.childNodes[0]); -} -el.appendChild(d); -} -} -} -fixEl.appendChild(n); -fixEl.removeChild(n); -} -},startResize:function(e){ -this.startCoords=this.cloneCoords(this.areaCoords); -this.resizing=true; -this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,""); -Event.stop(e); -},startDrag:function(e){ -this.selArea.show(); -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.dragging=true; -this.onDrag(e); -Event.stop(e); -},getCurPos:function(e){ -var el=this.imgWrap,wrapOffsets=Position.cumulativeOffset(el); -while(el.nodeName!="BODY"){ -wrapOffsets[1]-=el.scrollTop||0; -wrapOffsets[0]-=el.scrollLeft||0; -el=el.parentNode; -} -return curPos={x:Event.pointerX(e)-wrapOffsets[0],y:Event.pointerY(e)-wrapOffsets[1]}; -},onDrag:function(e){ -if(this.dragging||this.resizing){ -var _54=null; -var _55=this.getCurPos(e); -var _56=this.cloneCoords(this.areaCoords); -var _57={x:1,y:1}; -if(this.dragging){ -if(_55.x_59){ -_5c.reverse(); -} -_5a[_5b+"1"]=_5c[0]; -_5a[_5b+"2"]=_5c[1]; -},endCrop:function(){ -this.dragging=false; -this.resizing=false; -this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()}); -},subInitialize:function(){ -},subDrawArea:function(){ -}}; -Cropper.ImgWithPreview=Class.create(); -Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){ -this.hasPreviewImg=false; -if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){ -this.previewWrap=$(this.options.previewWrap); -this.previewImg=this.img.cloneNode(false); -this.previewImg.id="imgCrop_"+this.previewImg.id; -this.options.displayOnInit=true; -this.hasPreviewImg=true; -this.previewWrap.addClassName("imgCrop_previewWrap"); -this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"}); -this.previewWrap.appendChild(this.previewImg); -} -},subDrawArea:function(){ -if(this.hasPreviewImg){ -var _5d=this.calcW(); -var _5e=this.calcH(); -var _5f={x:this.imgW/_5d,y:this.imgH/_5e}; -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 _62=this.previewImg.style; -_62.width=_61.w; -_62.height=_61.h; -_62.left=_61.x; -_62.top=_61.y; -} -}}); +var CropDraggable=Class.create(); +Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){ +this.options=Object.extend({drawMethod:function(){ +}},arguments[1]||{}); +this.element=$PR(_1); +this.handle=this.element; +this.delta=this.currentDelta(); +this.dragging=false; +this.eventMouseDown=this.initDrag.bindAsEventListener(this); +Event.observe(this.handle,"mousedown",this.eventMouseDown); +Draggables.register(this); +},draw:function(_2){ +var _3=Position.cumulativeOffset(this.element); +var d=this.currentDelta(); +_3[0]-=d[0]; +_3[1]-=d[1]; +var p=[0,1].map(function(i){ +return (_2[i]-_3[i]-this.offset[i]); +}.bind(this)); +this.options.drawMethod(p); +}}); +var Cropper={}; +Cropper.Img=Class.create(); +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.img=$PR(_7); +this.clickCoords={x:0,y:0}; +this.dragging=false; +this.resizing=false; +this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent); +this.isIE=/MSIE/.test(navigator.userAgent); +this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent); +this.ratioX=0; +this.ratioY=0; +this.attached=false; +this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth)); +this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight)); +if(typeof this.img=="undefined"){ +return; +} +$A(document.getElementsByTagName("script")).each(function(s){ +if(s.src.match(/cropper\.js/)){ +var _a=s.src.replace(/cropper\.js(.*)?/,""); +var _b=document.createElement("link"); +_b.rel="stylesheet"; +_b.type="text/css"; +_b.href=_a+"cropper.css"; +_b.media="screen"; +document.getElementsByTagName("head")[0].appendChild(_b); +} +}); +if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){ +var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y); +this.ratioX=this.options.ratioDim.x/_c; +this.ratioY=this.options.ratioDim.y/_c; +} +this.subInitialize(); +if(this.img.complete||this.isWebKit){ +this.onLoad(); +}else{ +Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this)); +} +},getGCD:function(a,b){ +if(b==0){ +return a; +} +return this.getGCD(b,a%b); +},onLoad:function(){ +var _f="imgCrop_"; +var _10=this.img.parentNode; +var _11=""; +if(this.isOpera8){ +_11=" opera8"; +} +this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11}); +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.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")]); +var _12=[this.north,this.east,this.south,this.west]; +this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12); +this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"}); +this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"}); +this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"}); +this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"}); +this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"}); +this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"}); +this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"}); +this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"}); +this.selArea=Builder.node("div",{"class":_f+"selArea"},[Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeNorth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeEast"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeSouth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeWest"},[Builder.node("span")]),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,Builder.node("div",{"class":_f+"clickArea"})]); +this.imgWrap.appendChild(this.img); +this.imgWrap.appendChild(this.dragArea); +this.dragArea.appendChild(this.selArea); +this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"})); +_10.appendChild(this.imgWrap); +this.startDragBind=this.startDrag.bindAsEventListener(this); +Event.observe(this.dragArea,"mousedown",this.startDragBind); +this.onDragBind=this.onDrag.bindAsEventListener(this); +Event.observe(document,"mousemove",this.onDragBind); +this.endCropBind=this.endCrop.bindAsEventListener(this); +Event.observe(document,"mouseup",this.endCropBind); +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.registerHandles(true); +if(this.options.captureKeys){ +this.keysBind=this.handleKeys.bindAsEventListener(this); +Event.observe(document,"keypress",this.keysBind); +} +new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)}); +this.setParams(); +},registerHandles:function(_13){ +for(var i=0;i0&&this.options.ratioDim.y>0){ +_1a.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2); +_1a.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2); +_1a.x2=_1a.x1+this.options.ratioDim.x; +_1a.y2=_1a.y1+this.options.ratioDim.y; +_1b=true; +} +} +this.setAreaCoords(_1a,false,false,1); +if(this.options.displayOnInit&&_1b){ +this.selArea.show(); +this.drawArea(); +this.endCrop(); +} +this.attached=true; +},remove:function(){ +if(this.attached){ +this.attached=false; +this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap); +this.imgWrap.parentNode.removeChild(this.imgWrap); +Event.stopObserving(this.dragArea,"mousedown",this.startDragBind); +Event.stopObserving(document,"mousemove",this.onDragBind); +Event.stopObserving(document,"mouseup",this.endCropBind); +this.registerHandles(false); +if(this.options.captureKeys){ +Event.stopObserving(document,"keypress",this.keysBind); +} +} +},reset:function(){ +if(!this.attached){ +this.onLoad(); +}else{ +this.setParams(); +} +this.endCrop(); +},handleKeys:function(e){ +var dir={x:0,y:0}; +if(!this.dragging){ +switch(e.keyCode){ +case (37): +dir.x=-1; +break; +case (38): +dir.y=-1; +break; +case (39): +dir.x=1; +break; +case (40): +dir.y=1; +break; +} +if(dir.x!=0||dir.y!=0){ +if(e.shiftKey){ +dir.x*=10; +dir.y*=10; +} +this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]); +Event.stop(e); +} +} +},calcW:function(){ +return (this.areaCoords.x2-this.areaCoords.x1); +},calcH:function(){ +return (this.areaCoords.y2-this.areaCoords.y1); +},moveArea:function(_1e){ +this.setAreaCoords({x1:_1e[0],y1:_1e[1],x2:_1e[0]+this.calcW(),y2:_1e[1]+this.calcH()},true,false); +this.drawArea(); +},cloneCoords:function(_1f){ +return {x1:_1f.x1,y1:_1f.y1,x2:_1f.x2,y2:_1f.y2}; +},setAreaCoords:function(_20,_21,_22,_23,_24){ +if(_21){ +var _25=_20.x2-_20.x1; +var _26=_20.y2-_20.y1; +if(_20.x1<0){ +_20.x1=0; +_20.x2=_25; +} +if(_20.y1<0){ +_20.y1=0; +_20.y2=_26; +} +if(_20.x2>this.imgW){ +_20.x2=this.imgW; +_20.x1=this.imgW-_25; +} +if(_20.y2>this.imgH){ +_20.y2=this.imgH; +_20.y1=this.imgH-_26; +} +}else{ +if(_20.x1<0){ +_20.x1=0; +} +if(_20.y1<0){ +_20.y1=0; +} +if(_20.x2>this.imgW){ +_20.x2=this.imgW; +} +if(_20.y2>this.imgH){ +_20.y2=this.imgH; +} +if(_23!=null){ +if(this.ratioX>0){ +this.applyRatio(_20,{x:this.ratioX,y:this.ratioY},_23,_24); +}else{ +if(_22){ +this.applyRatio(_20,{x:1,y:1},_23,_24); +} +} +var _27=[this.options.minWidth,this.options.minHeight]; +var _28=[this.options.maxWidth,this.options.maxHeight]; +if(_27[0]>0||_27[1]>0||_28[0]>0||_28[1]>0){ +var _29={a1:_20.x1,a2:_20.x2}; +var _2a={a1:_20.y1,a2:_20.y2}; +var _2b={min:0,max:this.imgW}; +var _2c={min:0,max:this.imgH}; +if((_27[0]!=0||_27[1]!=0)&&_22){ +if(_27[0]>0){ +_27[1]=_27[0]; +}else{ +if(_27[1]>0){ +_27[0]=_27[1]; +} +} +} +if((_28[0]!=0||_28[0]!=0)&&_22){ +if(_28[0]>0&&_28[0]<=_28[1]){ +_28[1]=_28[0]; +}else{ +if(_28[1]>0&&_28[1]<=_28[0]){ +_28[0]=_28[1]; +} +} +} +if(_27[0]>0){ +this.applyDimRestriction(_29,_27[0],_23.x,_2b,"min"); +} +if(_27[1]>1){ +this.applyDimRestriction(_2a,_27[1],_23.y,_2c,"min"); +} +if(_28[0]>0){ +this.applyDimRestriction(_29,_28[0],_23.x,_2b,"max"); +} +if(_28[1]>1){ +this.applyDimRestriction(_2a,_28[1],_23.y,_2c,"max"); +} +_20={x1:_29.a1,y1:_2a.a1,x2:_29.a2,y2:_2a.a2}; +} +} +} +this.areaCoords=_20; +},applyDimRestriction:function(_2d,val,_2f,_30,_31){ +var _32; +if(_31=="min"){ +_32=((_2d.a2-_2d.a1)val); +} +if(_32){ +if(_2f==1){ +_2d.a2=_2d.a1+val; +}else{ +_2d.a1=_2d.a2-val; +} +if(_2d.a1<_30.min){ +_2d.a1=_30.min; +_2d.a2=val; +}else{ +if(_2d.a2>_30.max){ +_2d.a1=_30.max-val; +_2d.a2=_30.max; +} +} +} +},applyRatio:function(_33,_34,_35,_36){ +var _37; +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}); +_33.x1=_37.b1; +_33.y1=_37.a1; +_33.x2=_37.b2; +_33.y2=_37.a2; +}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}); +_33.x1=_37.a1; +_33.y1=_37.b1; +_33.x2=_37.a2; +_33.y2=_37.b2; +} +},applyRatioToAxis:function(_38,_39,_3a,_3b){ +var _3c=Object.extend(_38,{}); +var _3d=_3c.a2-_3c.a1; +var _3e=Math.floor(_3d*_39.b/_39.a); +var _3f; +var _40; +var _41=null; +if(_3a.b==1){ +_3f=_3c.b1+_3e; +if(_3f>_3b.max){ +_3f=_3b.max; +_41=_3f-_3c.b1; +} +_3c.b2=_3f; +}else{ +_3f=_3c.b2-_3e; +if(_3f<_3b.min){ +_3f=_3b.min; +_41=_3f+_3c.b2; +} +_3c.b1=_3f; +} +if(_41!=null){ +_40=Math.floor(_41*_39.a/_39.b); +if(_3a.a==1){ +_3c.a2=_3c.a1+_40; +}else{ +_3c.a1=_3c.a1=_3c.a2-_40; +} +} +return _3c; +},drawArea:function(){ +var _42=this.calcW(); +var _43=this.calcH(); +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 _46=this.selArea.style; +_46.left=_45[0]; +_46.top=_45[1]; +_46.width=_45[2]; +_46.height=_45[3]; +var _47=Math.ceil((_42-6)/2)+px; +var _48=Math.ceil((_43-6)/2)+px; +this.handleN.style.left=_47; +this.handleE.style.top=_48; +this.handleS.style.left=_47; +this.handleW.style.top=_48; +this.north.style.height=_45[1]; +var _49=this.east.style; +_49.top=_45[1]; +_49.height=_45[3]; +_49.left=_45[4]; +_49.width=_45[6]; +var _4a=this.south.style; +_4a.top=_45[5]; +_4a.height=_45[7]; +var _4b=this.west.style; +_4b.top=_45[1]; +_4b.height=_45[3]; +_4b.width=_45[0]; +this.subDrawArea(); +this.forceReRender(); +},forceReRender:function(){ +if(this.isIE||this.isWebKit){ +var n=document.createTextNode(" "); +var d,el,fixEL,i; +if(this.isIE){ +fixEl=this.selArea; +}else{ +if(this.isWebKit){ +fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0]; +d=Builder.node("div",""); +d.style.visibility="hidden"; +var _4e=["SE","S","SW"]; +for(i=0;i<_4e.length;i++){ +el=document.getElementsByClassName("imgCrop_handle"+_4e[i],this.selArea)[0]; +if(el.childNodes.length){ +el.removeChild(el.childNodes[0]); +} +el.appendChild(d); +} +} +} +fixEl.appendChild(n); +fixEl.removeChild(n); +} +},startResize:function(e){ +this.startCoords=this.cloneCoords(this.areaCoords); +this.resizing=true; +this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,""); +Event.stop(e); +},startDrag:function(e){ +this.selArea.show(); +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.dragging=true; +this.onDrag(e); +Event.stop(e); +},getCurPos:function(e){ +var el=this.imgWrap,wrapOffsets=Position.cumulativeOffset(el); +while(el.nodeName!="BODY"){ +wrapOffsets[1]-=el.scrollTop||0; +wrapOffsets[0]-=el.scrollLeft||0; +el=el.parentNode; +} +return curPos={x:Event.pointerX(e)-wrapOffsets[0],y:Event.pointerY(e)-wrapOffsets[1]}; +},onDrag:function(e){ +if(this.dragging||this.resizing){ +var _54=null; +var _55=this.getCurPos(e); +var _56=this.cloneCoords(this.areaCoords); +var _57={x:1,y:1}; +if(this.dragging){ +if(_55.x_59){ +_5c.reverse(); +} +_5a[_5b+"1"]=_5c[0]; +_5a[_5b+"2"]=_5c[1]; +},endCrop:function(){ +this.dragging=false; +this.resizing=false; +this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()}); +},subInitialize:function(){ +},subDrawArea:function(){ +}}; +Cropper.ImgWithPreview=Class.create(); +Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){ +this.hasPreviewImg=false; +if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){ +this.previewWrap=$PR(this.options.previewWrap); +this.previewImg=this.img.cloneNode(false); +this.previewImg.id="imgCrop_"+this.previewImg.id; +this.options.displayOnInit=true; +this.hasPreviewImg=true; +this.previewWrap.addClassName("imgCrop_previewWrap"); +this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"}); +this.previewWrap.appendChild(this.previewImg); +} +},subDrawArea:function(){ +if(this.hasPreviewImg){ +var _5d=this.calcW(); +var _5e=this.calcH(); +var _5f={x:this.imgW/_5d,y:this.imgH/_5e}; +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 _62=this.previewImg.style; +_62.width=_61.w; +_62.height=_61.h; +_62.left=_61.x; +_62.top=_61.y; +} +}}); diff --git a/library/cropper/cropper.uncompressed.js b/library/cropper/cropper.uncompressed.js index 66185546e2..0ea0b803d0 100644 --- a/library/cropper/cropper.uncompressed.js +++ b/library/cropper/cropper.uncompressed.js @@ -113,6 +113,8 @@ * http://www.opensource.org/licenses/bsd-license.php * * 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] || {} ); - this.element = $(element); + this.element = $PR(element); this.handle = this.element; @@ -212,12 +214,12 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), { * * Example: * function onEndCrop( coords, dimensions ) { - * $( 'x1' ).value = coords.x1; - * $( 'y1' ).value = coords.y1; - * $( 'x2' ).value = coords.x2; - * $( 'y2' ).value = coords.y2; - * $( 'width' ).value = dimensions.width; - * $( 'height' ).value = dimensions.height; + * $PR( 'x1' ).value = coords.x1; + * $PR( 'y1' ).value = coords.y1; + * $PR( 'x2' ).value = coords.x2; + * $PR( 'y2' ).value = coords.y2; + * $PR( 'width' ).value = dimensions.width; + * $PR( 'height' ).value = dimensions.height; * } * */ @@ -288,7 +290,7 @@ Cropper.Img.prototype = { * @var obj * The img node to attach to */ - this.img = $( element ); + this.img = $PR( element ); /** * @var obj * The x & y coordinates of the click point @@ -524,7 +526,7 @@ Cropper.Img.prototype = { */ registerHandles: function( registration ) { for( var i = 0; i < this.handles.length; i++ ) { - var handle = $( this.handles[i] ); + var handle = $PR( this.handles[i] ); if( registration ) { var hideHandle = false; // whether to hide the handle @@ -569,16 +571,16 @@ Cropper.Img.prototype = { */ this.imgH = this.img.height; - $( this.north ).setStyle( { height: 0 } ); - $( this.east ).setStyle( { width: 0, height: 0 } ); - $( this.south ).setStyle( { height: 0 } ); - $( this.west ).setStyle( { width: 0, height: 0 } ); + $PR( this.north ).setStyle( { height: 0 } ); + $PR( this.east ).setStyle( { width: 0, height: 0 } ); + $PR( this.south ).setStyle( { height: 0 } ); + $PR( this.west ).setStyle( { width: 0, height: 0 } ); // 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 - $( this.selArea ).hide(); + $PR( this.selArea ).hide(); // setup the starting position of the select area 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 * @var obj HTML element */ - this.previewWrap = $( this.options.previewWrap ); + this.previewWrap = $PR( this.options.previewWrap ); /** * The preview image element * @var obj HTML IMG element diff --git a/library/cropper/lib/controls.js b/library/cropper/lib/controls.js index de0261ed54..9606948779 100644 --- a/library/cropper/lib/controls.js +++ b/library/cropper/lib/controls.js @@ -37,8 +37,8 @@ var Autocompleter = {} Autocompleter.Base = function() {}; Autocompleter.Base.prototype = { baseInitialize: function(element, update, options) { - this.element = $(element); - this.update = $(update); + this.element = $PR(element); + this.update = $PR(update); this.hasFocus = false; this.changed = false; this.active = false; @@ -88,7 +88,7 @@ Autocompleter.Base.prototype = { ''); - this.iefix = $(this.update.id+'_iefix'); + this.iefix = $PR(this.update.id+'_iefix'); } if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); }, @@ -456,7 +456,7 @@ Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99"; Ajax.InPlaceEditor.prototype = { initialize: function(element, url, options) { this.url = url; - this.element = $(element); + this.element = $PR(element); this.options = Object.extend({ okButton: true, @@ -491,14 +491,14 @@ Ajax.InPlaceEditor.prototype = { if(!this.options.formId && this.element.id) { 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 this.options.formId = null; } } 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'); @@ -796,7 +796,7 @@ Form.Element.DelayedObserver = Class.create(); Form.Element.DelayedObserver.prototype = { initialize: function(element, delay, callback) { this.delay = delay || 0.5; - this.element = $(element); + this.element = $PR(element); this.callback = callback; this.timer = null; this.lastValue = $F(this.element); diff --git a/library/cropper/lib/dragdrop.js b/library/cropper/lib/dragdrop.js index be2a30f538..baa607c67f 100644 --- a/library/cropper/lib/dragdrop.js +++ b/library/cropper/lib/dragdrop.js @@ -9,11 +9,11 @@ var Droppables = { drops: [], 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) { - element = $(element); + element = $PR(element); var options = Object.extend({ greedy: true, hoverclass: null, @@ -26,9 +26,9 @@ var Droppables = { var containment = options.containment; if((typeof containment == 'object') && (containment.constructor == Array)) { - containment.each( function(c) { options._containers.push($(c)) }); + containment.each( function(c) { options._containers.push($PR(c)) }); } 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] } }, arguments[1] || {}); - this.element = $(element); + this.element = $PR(element); if(options.handle && (typeof options.handle == 'string')) { var h = Element.childrenWithClassName(this.element, options.handle, true); 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(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) - options.scroll = $(options.scroll); + options.scroll = $PR(options.scroll); Element.makePositioned(this.element); // fix IE @@ -508,7 +508,7 @@ Draggable.prototype = { var SortableObserver = Class.create(); SortableObserver.prototype = { initialize: function(element, observer) { - this.element = $(element); + this.element = $PR(element); this.observer = observer; this.lastValue = Sortable.serialize(this.element); }, @@ -535,7 +535,7 @@ var Sortable = { }, options: function(element) { - element = Sortable._findRootElement($(element)); + element = Sortable._findRootElement($PR(element)); if(!element) return; return Sortable.sortables[element.id]; }, @@ -553,7 +553,7 @@ var Sortable = { }, create: function(element) { - element = $(element); + element = $PR(element); var options = Object.extend({ element: element, tag: 'li', // assumes li children, override with tag: 'tagname' @@ -744,7 +744,7 @@ var Sortable = { if(sortable && !sortable.ghosting) return; if(!Sortable._marker) { - Sortable._marker = $('dropmarker') || document.createElement('DIV'); + Sortable._marker = $PR('dropmarker') || document.createElement('DIV'); Element.hide(Sortable._marker); Element.addClassName(Sortable._marker, 'dropmarker'); Sortable._marker.style.position = 'absolute'; @@ -802,7 +802,7 @@ var Sortable = { }, tree: function(element) { - element = $(element); + element = $PR(element); var sortableOptions = this.options(element); var options = Object.extend({ tag: sortableOptions.tag, @@ -833,16 +833,16 @@ var Sortable = { }, sequence: function(element) { - element = $(element); + element = $PR(element); 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] : ''; }); }, setSequence: function(element, new_sequence) { - element = $(element); + element = $PR(element); var options = Object.extend(this.options(element), arguments[2] || {}); var nodeMap = {}; @@ -862,7 +862,7 @@ var Sortable = { }, serialize: function(element) { - element = $(element); + element = $PR(element); var options = Object.extend(Sortable.options(element), arguments[1] || {}); var name = encodeURIComponent( (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); @@ -912,4 +912,4 @@ Element.offsetSize = function (element, type) { return element.offsetHeight; else return element.offsetWidth; -} \ No newline at end of file +} diff --git a/library/cropper/lib/effects.js b/library/cropper/lib/effects.js index 0864323ecd..7e0407deb3 100644 --- a/library/cropper/lib/effects.js +++ b/library/cropper/lib/effects.js @@ -25,14 +25,14 @@ String.prototype.parseColor = function() { /*--------------------------------------------------------------------------*/ 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 : (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); }).flatten().join(''); } 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 : ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? Element.collectTextNodesIgnoreClass(node, className) : '')); @@ -40,7 +40,7 @@ Element.collectTextNodesIgnoreClass = function(element, className) { } Element.setContentZoom = function(element, percent) { - element = $(element); + element = $PR(element); Element.setStyle(element, {fontSize: (percent/100) + 'em'}); if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); } @@ -55,7 +55,7 @@ Element.getOpacity = function(element){ } Element.setOpacity = function(element, value){ - element= $(element); + element= $PR(element); if (value == 1){ Element.setStyle(element, { opacity: (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? @@ -73,12 +73,12 @@ Element.setOpacity = function(element, value){ } Element.getInlineOpacity = function(element){ - return $(element).style.opacity || ''; + return $PR(element).style.opacity || ''; } Element.childrenWithClassName = function(element, className, findFirst) { 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)); }); if(!results) results = []; @@ -87,7 +87,7 @@ Element.childrenWithClassName = function(element, className, findFirst) { Element.forceRerendering = function(element) { try { - element = $(element); + element = $PR(element); var n = document.createTextNode(' '); element.appendChild(n); element.removeChild(n); @@ -107,7 +107,7 @@ var Effect = { tagifyText: function(element) { var tagifyStyle = 'position:relative'; if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1'; - element = $(element); + element = $PR(element); $A(element.childNodes).each( function(child) { if(child.nodeType==3) { child.nodeValue.toArray().each( function(character) { @@ -127,7 +127,7 @@ var Effect = { (element.length)) elements = element; else - elements = $(element).childNodes; + elements = $PR(element).childNodes; var options = Object.extend({ speed: 0.1, @@ -145,7 +145,7 @@ var Effect = { 'appear': ['Appear','Fade'] }, toggle: function(element, effect) { - element = $(element); + element = $PR(element); effect = (effect || 'appear').toLowerCase(); var options = Object.extend({ 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(); Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), { initialize: function(element) { - this.element = $(element); + this.element = $PR(element); // make this work on IE on elements without 'layout' if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout)) this.element.setStyle({zoom: 1}); @@ -369,7 +369,7 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), { Effect.Move = Class.create(); Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), { initialize: function(element) { - this.element = $(element); + this.element = $PR(element); var options = Object.extend({ x: 0, y: 0, @@ -408,7 +408,7 @@ Effect.MoveBy = function(element, toTop, toLeft) { Effect.Scale = Class.create(); Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), { initialize: function(element, percent) { - this.element = $(element) + this.element = $PR(element) var options = Object.extend({ scaleX: true, scaleY: true, @@ -482,7 +482,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), { Effect.Highlight = Class.create(); Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), { initialize: function(element) { - this.element = $(element); + this.element = $PR(element); var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {}); this.start(options); }, @@ -515,7 +515,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), Effect.ScrollTo = Class.create(); Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), { initialize: function(element) { - this.element = $(element); + this.element = $PR(element); this.start(arguments[1] || {}); }, setup: function() { @@ -540,7 +540,7 @@ Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), { /* ------------- combination effects ------------- */ Effect.Fade = function(element) { - element = $(element); + element = $PR(element); var oldOpacity = element.getInlineOpacity(); var options = Object.extend({ from: element.getOpacity() || 1.0, @@ -554,7 +554,7 @@ Effect.Fade = function(element) { } Effect.Appear = function(element) { - element = $(element); + element = $PR(element); var options = Object.extend({ from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), to: 1.0, @@ -570,7 +570,7 @@ Effect.Appear = function(element) { } Effect.Puff = function(element) { - element = $(element); + element = $PR(element); var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') }; return new Effect.Parallel( [ new Effect.Scale(element, 200, @@ -587,7 +587,7 @@ Effect.Puff = function(element) { } Effect.BlindUp = function(element) { - element = $(element); + element = $PR(element); element.makeClipping(); return new Effect.Scale(element, 0, Object.extend({ scaleContent: false, @@ -602,7 +602,7 @@ Effect.BlindUp = function(element) { } Effect.BlindDown = function(element) { - element = $(element); + element = $PR(element); var elementDimensions = element.getDimensions(); return new Effect.Scale(element, 100, Object.extend({ scaleContent: false, @@ -623,7 +623,7 @@ Effect.BlindDown = function(element) { } Effect.SwitchOff = function(element) { - element = $(element); + element = $PR(element); var oldOpacity = element.getInlineOpacity(); return new Effect.Appear(element, { duration: 0.4, @@ -649,7 +649,7 @@ Effect.SwitchOff = function(element) { } Effect.DropOut = function(element) { - element = $(element); + element = $PR(element); var oldStyle = { top: element.getStyle('top'), left: element.getStyle('left'), @@ -671,7 +671,7 @@ Effect.DropOut = function(element) { } Effect.Shake = function(element) { - element = $(element); + element = $PR(element); var oldStyle = { top: element.getStyle('top'), left: element.getStyle('left') }; @@ -693,10 +693,10 @@ Effect.Shake = function(element) { } Effect.SlideDown = function(element) { - element = $(element); + element = $PR(element); element.cleanWhitespace(); // 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(); return new Effect.Scale(element, 100, Object.extend({ scaleContent: false, @@ -731,9 +731,9 @@ Effect.SlideDown = function(element) { } Effect.SlideUp = function(element) { - element = $(element); + element = $PR(element); element.cleanWhitespace(); - var oldInnerBottom = $(element.firstChild).getStyle('bottom'); + var oldInnerBottom = $PR(element.firstChild).getStyle('bottom'); return new Effect.Scale(element, window.opera ? 0 : 1, Object.extend({ scaleContent: false, scaleX: false, @@ -772,7 +772,7 @@ Effect.Squish = function(element) { } Effect.Grow = function(element) { - element = $(element); + element = $PR(element); var options = Object.extend({ direction: 'center', moveTransition: Effect.Transitions.sinoidal, @@ -851,7 +851,7 @@ Effect.Grow = function(element) { } Effect.Shrink = function(element) { - element = $(element); + element = $PR(element); var options = Object.extend({ direction: 'center', moveTransition: Effect.Transitions.sinoidal, @@ -908,7 +908,7 @@ Effect.Shrink = function(element) { } Effect.Pulsate = function(element) { - element = $(element); + element = $PR(element); var options = arguments[1] || {}; var oldOpacity = element.getInlineOpacity(); var transition = options.transition || Effect.Transitions.sinoidal; @@ -921,7 +921,7 @@ Effect.Pulsate = function(element) { } Effect.Fold = function(element) { - element = $(element); + element = $PR(element); var oldStyle = { top: element.style.top, left: element.style.left, @@ -952,7 +952,7 @@ Element.Methods.visualEffect = function(element, effect, options) { s = effect.gsub(/_/, '-').camelize(); effect_class = s.charAt(0).toUpperCase() + s.substring(1); new Effect[effect_class](element, options); - return $(element); + return $PR(element); }; -Element.addMethods(); \ No newline at end of file +Element.addMethods(); diff --git a/library/cropper/lib/prototype.js b/library/cropper/lib/prototype.js index 0caf9cd7f0..6682065875 100644 --- a/library/cropper/lib/prototype.js +++ b/library/cropper/lib/prototype.js @@ -784,9 +784,9 @@ Ajax.Updater = Class.create(); Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { initialize: function(container, url, options) { this.containers = { - success: container.success ? $(container.success) : $(container), - failure: container.failure ? $(container.failure) : - (container.success ? null : $(container)) + success: container.success ? $PR(container.success) : $PR(container), + failure: container.failure ? $PR(container.failure) : + (container.success ? null : $PR(container)) } 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); } }); -function $() { +function $PR() { var results = [], element; for (var i = 0; i < arguments.length; i++) { element = arguments[i]; @@ -878,7 +878,7 @@ function $() { } 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) { if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) elements.push(Element.extend(child)); @@ -918,42 +918,42 @@ Element.extend.cache = { Element.Methods = { visible: function(element) { - return $(element).style.display != 'none'; + return $PR(element).style.display != 'none'; }, toggle: function() { for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); + var element = $PR(arguments[i]); Element[Element.visible(element) ? 'hide' : 'show'](element); } }, hide: function() { for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); + var element = $PR(arguments[i]); element.style.display = 'none'; } }, show: function() { for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); + var element = $PR(arguments[i]); element.style.display = ''; } }, remove: function(element) { - element = $(element); + element = $PR(element); element.parentNode.removeChild(element); }, update: function(element, html) { - $(element).innerHTML = html.stripScripts(); + $PR(element).innerHTML = html.stripScripts(); setTimeout(function() {html.evalScripts()}, 10); }, replace: function(element, html) { - element = $(element); + element = $PR(element); if (element.outerHTML) { element.outerHTML = html.stripScripts(); } else { @@ -966,7 +966,7 @@ Element.Methods = { }, getHeight: function(element) { - element = $(element); + element = $PR(element); return element.offsetHeight; }, @@ -975,23 +975,23 @@ Element.Methods = { }, hasClassName: function(element, className) { - if (!(element = $(element))) return; + if (!(element = $PR(element))) return; return Element.classNames(element).include(className); }, addClassName: function(element, className) { - if (!(element = $(element))) return; + if (!(element = $PR(element))) return; return Element.classNames(element).add(className); }, removeClassName: function(element, className) { - if (!(element = $(element))) return; + if (!(element = $PR(element))) return; return Element.classNames(element).remove(className); }, // removes whitespace-only text node children cleanWhitespace: function(element) { - element = $(element); + element = $PR(element); for (var i = 0; i < element.childNodes.length; i++) { var node = element.childNodes[i]; if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) @@ -1000,25 +1000,25 @@ Element.Methods = { }, empty: function(element) { - return $(element).innerHTML.match(/^\s*$/); + return $PR(element).innerHTML.match(/^\s*$/); }, childOf: function(element, ancestor) { - element = $(element), ancestor = $(ancestor); + element = $PR(element), ancestor = $PR(ancestor); while (element = element.parentNode) if (element == ancestor) return true; return false; }, scrollTo: function(element) { - element = $(element); + element = $PR(element); var x = element.x ? element.x : element.offsetLeft, y = element.y ? element.y : element.offsetTop; window.scrollTo(x, y); }, getStyle: function(element, style) { - element = $(element); + element = $PR(element); var value = element.style[style.camelize()]; if (!value) { if (document.defaultView && document.defaultView.getComputedStyle) { @@ -1036,13 +1036,13 @@ Element.Methods = { }, setStyle: function(element, style) { - element = $(element); + element = $PR(element); for (var name in style) element.style[name.camelize()] = style[name]; }, getDimensions: function(element) { - element = $(element); + element = $PR(element); if (Element.getStyle(element, 'display') != 'none') return {width: element.offsetWidth, height: element.offsetHeight}; @@ -1063,7 +1063,7 @@ Element.Methods = { }, makePositioned: function(element) { - element = $(element); + element = $PR(element); var pos = Element.getStyle(element, 'position'); if (pos == 'static' || !pos) { element._madePositioned = true; @@ -1078,7 +1078,7 @@ Element.Methods = { }, undoPositioned: function(element) { - element = $(element); + element = $PR(element); if (element._madePositioned) { element._madePositioned = undefined; element.style.position = @@ -1090,7 +1090,7 @@ Element.Methods = { }, makeClipping: function(element) { - element = $(element); + element = $PR(element); if (element._overflow) return; element._overflow = element.style.overflow; if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') @@ -1098,7 +1098,7 @@ Element.Methods = { }, undoClipping: function(element) { - element = $(element); + element = $PR(element); if (element._overflow) return; element.style.overflow = element._overflow; element._overflow = undefined; @@ -1141,7 +1141,7 @@ Abstract.Insertion = function(adjacency) { Abstract.Insertion.prototype = { initialize: function(element, content) { - this.element = $(element); + this.element = $PR(element); this.content = content.stripScripts(); 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.prototype = { initialize: function(element) { - this.element = $(element); + this.element = $PR(element); }, _each: function(iterator) { @@ -1346,7 +1346,7 @@ Selector.prototype = { findElements: function(scope) { var element; - if (element = $(this.params.id)) + if (element = $PR(this.params.id)) if (this.match(element)) if (!scope || Element.childOf(element, scope)) return [element]; @@ -1377,25 +1377,25 @@ function $$() { var Field = { clear: function() { for (var i = 0; i < arguments.length; i++) - $(arguments[i]).value = ''; + $PR(arguments[i]).value = ''; }, focus: function(element) { - $(element).focus(); + $PR(element).focus(); }, present: function() { for (var i = 0; i < arguments.length; i++) - if ($(arguments[i]).value == '') return false; + if ($PR(arguments[i]).value == '') return false; return true; }, select: function(element) { - $(element).select(); + $PR(element).select(); }, activate: function(element) { - element = $(element); + element = $PR(element); element.focus(); if (element.select) element.select(); @@ -1406,7 +1406,7 @@ var Field = { var Form = { serialize: function(form) { - var elements = Form.getElements($(form)); + var elements = Form.getElements($PR(form)); var queryComponents = new Array(); for (var i = 0; i < elements.length; i++) { @@ -1419,7 +1419,7 @@ var Form = { }, getElements: function(form) { - form = $(form); + form = $PR(form); var elements = new Array(); for (var tagName in Form.Element.Serializers) { @@ -1431,7 +1431,7 @@ var Form = { }, getInputs: function(form, typeName, name) { - form = $(form); + form = $PR(form); var inputs = form.getElementsByTagName('input'); if (!typeName && !name) @@ -1478,13 +1478,13 @@ var Form = { }, reset: function(form) { - $(form).reset(); + $PR(form).reset(); } } Form.Element = { serialize: function(element) { - element = $(element); + element = $PR(element); var method = element.tagName.toLowerCase(); var parameter = Form.Element.Serializers[method](element); @@ -1502,7 +1502,7 @@ Form.Element = { }, getValue: function(element) { - element = $(element); + element = $PR(element); var method = element.tagName.toLowerCase(); var parameter = Form.Element.Serializers[method](element); @@ -1570,7 +1570,7 @@ Abstract.TimedObserver = function() {} Abstract.TimedObserver.prototype = { initialize: function(element, frequency, callback) { this.frequency = frequency; - this.element = $(element); + this.element = $PR(element); this.callback = callback; this.lastValue = this.getValue(); @@ -1609,7 +1609,7 @@ Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { Abstract.EventObserver = function() {} Abstract.EventObserver.prototype = { initialize: function(element, callback) { - this.element = $(element); + this.element = $PR(element); this.callback = callback; this.lastValue = this.getValue(); @@ -1742,7 +1742,7 @@ Object.extend(Event, { }, observe: function(element, name, observer, useCapture) { - var element = $(element); + var element = $PR(element); useCapture = useCapture || false; if (name == 'keypress' && @@ -1754,7 +1754,7 @@ Object.extend(Event, { }, stopObserving: function(element, name, observer, useCapture) { - var element = $(element); + var element = $PR(element); useCapture = useCapture || false; if (name == 'keypress' && @@ -1876,8 +1876,8 @@ var Position = { }, clone: function(source, target) { - source = $(source); - target = $(target); + source = $PR(source); + target = $PR(target); target.style.position = 'absolute'; var offsets = this.cumulativeOffset(source); target.style.top = offsets[1] + 'px'; @@ -1920,11 +1920,11 @@ var Position = { }, arguments[2] || {}) // find page position of source - source = $(source); + source = $PR(source); var p = Position.page(source); // find coordinate system to use - target = $(target); + target = $PR(target); var delta = [0, 0]; var parent = null; // delta [0,0] will do fine with position: fixed elements, @@ -1948,7 +1948,7 @@ var Position = { }, absolutize: function(element) { - element = $(element); + element = $PR(element); if (element.style.position == 'absolute') return; Position.prepare(); @@ -1971,7 +1971,7 @@ var Position = { }, relativize: function(element) { - element = $(element); + element = $PR(element); if (element.style.position == 'relative') return; Position.prepare(); @@ -2003,4 +2003,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { return [valueL, valueT]; } -} \ No newline at end of file +} diff --git a/library/cropper/lib/slider.js b/library/cropper/lib/slider.js index c0f1fc01bb..cd16b692d6 100644 --- a/library/cropper/lib/slider.js +++ b/library/cropper/lib/slider.js @@ -35,12 +35,12 @@ Control.Slider.prototype = { var slider = this; if(handle instanceof Array) { - this.handles = handle.collect( function(e) { return $(e) }); + this.handles = handle.collect( function(e) { return $PR(e) }); } else { - this.handles = [$(handle)]; + this.handles = [$PR(handle)]; } - this.track = $(track); + this.track = $PR(track); this.options = options || {}; this.axis = this.options.axis || 'horizontal'; @@ -50,9 +50,9 @@ Control.Slider.prototype = { this.value = 0; // assure backwards compat this.values = this.handles.map( function() { return 0 }); - this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false; - this.options.startSpan = $(this.options.startSpan || null); - this.options.endSpan = $(this.options.endSpan || null); + this.spans = this.options.spans ? this.options.spans.map(function(s){ return $PR(s) }) : false; + this.options.startSpan = $PR(this.options.startSpan || null); + this.options.endSpan = $PR(this.options.endSpan || null); 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.event = null; } -} \ No newline at end of file +} diff --git a/library/cropper/lib/unittest.js b/library/cropper/lib/unittest.js index d2c2d8171d..be0d252273 100644 --- a/library/cropper/lib/unittest.js +++ b/library/cropper/lib/unittest.js @@ -32,7 +32,7 @@ Event.simulateMouse = function(element, eventName) { var oEvent = document.createEvent("MouseEvents"); oEvent.initMouseEvent(eventName, true, true, document.defaultView, 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); this.mark = document.createElement('div'); @@ -49,7 +49,7 @@ Event.simulateMouse = function(element, eventName) { if(this.step) 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. @@ -69,7 +69,7 @@ Event.simulateKey = function(element, eventName) { oEvent.initKeyEvent(eventName, true, true, window, options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.keyCode, options.charCode ); - $(element).dispatchEvent(oEvent); + $PR(element).dispatchEvent(oEvent); }; Event.simulateKeys = function(element, command) { @@ -87,7 +87,7 @@ Test.Unit.inspect = Object.inspect; Test.Unit.Logger = Class.create(); Test.Unit.Logger.prototype = { initialize: function(log) { - this.log = $(log); + this.log = $PR(log); if (this.log) { this._createLogTable(); } @@ -126,8 +126,8 @@ Test.Unit.Logger.prototype = { 'StatusTestMessage' + '' + ''; - this.logsummary = $('logsummary') - this.loglines = $('loglines'); + this.logsummary = $PR('logsummary') + this.loglines = $PR('loglines'); }, _toHTML: function(txt) { return txt.escapeHTML().replace(/\n/g,"
"); @@ -142,7 +142,7 @@ Test.Unit.Runner.prototype = { }, arguments[1] || {}); this.options.resultsURL = this.parseResultsURLQueryParameter(); if (this.options.testLog) { - this.options.testLog = $(this.options.testLog) || null; + this.options.testLog = $PR(this.options.testLog) || null; } if(this.options.tests) { this.tests = []; @@ -326,7 +326,7 @@ Test.Unit.Assertions.prototype = { catch(e) { this.error(e); } }, _isVisible: function(element) { - element = $(element); + element = $PR(element); if(!element.parentNode) return true; this.assertNotNull(element); if(element.style && Element.getStyle(element, 'display') == 'none') diff --git a/library/cropper/tests/example-Basic.htm b/library/cropper/tests/example-Basic.htm index 391c2ecdbc..2a55eca5ab 100644 --- a/library/cropper/tests/example-Basic.htm +++ b/library/cropper/tests/example-Basic.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // basic example diff --git a/library/cropper/tests/example-CSS-Absolute.htm b/library/cropper/tests/example-CSS-Absolute.htm index 17e4c489d3..b605fd344d 100644 --- a/library/cropper/tests/example-CSS-Absolute.htm +++ b/library/cropper/tests/example-CSS-Absolute.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // Absolute positioned example diff --git a/library/cropper/tests/example-CSS-Float.htm b/library/cropper/tests/example-CSS-Float.htm index 5066553fef..3dbeeab4b1 100644 --- a/library/cropper/tests/example-CSS-Float.htm +++ b/library/cropper/tests/example-CSS-Float.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // float example @@ -30,12 +30,12 @@ 'testFloatImage', { onEndCrop: function( coords, dimensions ) { - $( 'floatX1' ).value = coords.x1; - $( 'floatY1' ).value = coords.y1; - $( 'floatX2' ).value = coords.x2; - $( 'floatY2' ).value = coords.y2; - $( 'floatWidth' ).value = dimensions.width; - $( 'floatHeight' ).value = dimensions.height; + $PR( 'floatX1' ).value = coords.x1; + $PR( 'floatY1' ).value = coords.y1; + $PR( 'floatX2' ).value = coords.x2; + $PR( 'floatY2' ).value = coords.y2; + $PR( 'floatWidth' ).value = dimensions.width; + $PR( 'floatHeight' ).value = dimensions.height; } } ); diff --git a/library/cropper/tests/example-CSS-Relative.htm b/library/cropper/tests/example-CSS-Relative.htm index 5894fe1f9f..ecad1341a6 100644 --- a/library/cropper/tests/example-CSS-Relative.htm +++ b/library/cropper/tests/example-CSS-Relative.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // relative example diff --git a/library/cropper/tests/example-CoordsOnLoad.htm b/library/cropper/tests/example-CoordsOnLoad.htm index 254a23472d..c14289c2de 100644 --- a/library/cropper/tests/example-CoordsOnLoad.htm +++ b/library/cropper/tests/example-CoordsOnLoad.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // basic example diff --git a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm index 3a696360a8..9ba02da111 100644 --- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm +++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm @@ -13,12 +13,12 @@ // setup the callback function function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } // basic example diff --git a/library/cropper/tests/example-Dimensions.htm b/library/cropper/tests/example-Dimensions.htm index f54f996839..10e5ba26ca 100644 --- a/library/cropper/tests/example-Dimensions.htm +++ b/library/cropper/tests/example-Dimensions.htm @@ -12,12 +12,12 @@ diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index d3cc75635e..3d69e2d272 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index 3c400b5ad2..41a636fca4 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -1,10 +1,5 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
+
{{$field.3}} diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index b00ddabcd8..d8a9394a15 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -1,10 +1,5 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
+
{{$field.3}} diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 5889d2e9c0..5dd2c5d3f8 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -1,10 +1,5 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
+
{{$field.3}} diff --git a/view/templates/login_head.tpl b/view/templates/login_head.tpl index a7fb961089..e69de29bb2 100644 --- a/view/templates/login_head.tpl +++ b/view/templates/login_head.tpl @@ -1,5 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/templates/posted_date_widget.tpl b/view/templates/posted_date_widget.tpl index 2f5838edb8..009fa60a65 100644 --- a/view/templates/posted_date_widget.tpl +++ b/view/templates/posted_date_widget.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

diff --git a/view/theme/decaf-mobile/js/theme.js b/view/theme/decaf-mobile/js/theme.js index cd9a17f0dd..c10382264a 100644 --- a/view/theme/decaf-mobile/js/theme.js +++ b/view/theme/decaf-mobile/js/theme.js @@ -23,11 +23,11 @@ document.addEventListener('DOMContentLoaded', function(){ window.imageUploadButton, { action: 'wall_upload/'+window.nickname, name: 'userfile', - onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { - var currentText = $j(window.jotId).val(); - $j(window.jotId).val(currentText + response); - $j('#profile-rotator').hide(); + var currentText = $(window.jotId).val(); + $(window.jotId).val(currentText + response); + $('#profile-rotator').hide(); } } ); @@ -37,11 +37,11 @@ document.addEventListener('DOMContentLoaded', function(){ 'wall-file-upload', { action: 'wall_attach/'+window.nickname, name: 'userfile', - onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { - var currentText = $j(window.jotId).val(); - $j(window.jotId).val(currentText + response); - $j('#profile-rotator').hide(); + var currentText = $(window.jotId).val(); + $(window.jotId).val(currentText + response); + $('#profile-rotator').hide(); } } ); diff --git a/view/theme/decaf-mobile/js/theme.min.js b/view/theme/decaf-mobile/js/theme.min.js index 91f2daa9b1..f987bbe01e 100644 --- a/view/theme/decaf-mobile/js/theme.min.js +++ b/view/theme/decaf-mobile/js/theme.min.js @@ -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){} \ No newline at end of file +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){} \ No newline at end of file diff --git a/view/theme/decaf-mobile/templates/admin_users.tpl b/view/theme/decaf-mobile/templates/admin_users.tpl index df795a1f4f..47a7e65638 100644 --- a/view/theme/decaf-mobile/templates/admin_users.tpl +++ b/view/theme/decaf-mobile/templates/admin_users.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/decaf-mobile/templates/cropbody.tpl b/view/theme/decaf-mobile/templates/cropbody.tpl index 5ace9a1aaf..2678488e7d 100644 --- a/view/theme/decaf-mobile/templates/cropbody.tpl +++ b/view/theme/decaf-mobile/templates/cropbody.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

{{$desc}} diff --git a/view/theme/decaf-mobile/templates/cropend.tpl b/view/theme/decaf-mobile/templates/cropend.tpl index e75083f512..ade969baf0 100644 --- a/view/theme/decaf-mobile/templates/cropend.tpl +++ b/view/theme/decaf-mobile/templates/cropend.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{**}} {{**}} @@ -25,6 +24,5 @@ diff --git a/view/theme/decaf-mobile/templates/field_input.tpl b/view/theme/decaf-mobile/templates/field_input.tpl index 240bed249f..e2c519b916 100644 --- a/view/theme/decaf-mobile/templates/field_input.tpl +++ b/view/theme/decaf-mobile/templates/field_input.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}


diff --git a/view/theme/decaf-mobile/templates/jot_geotag.tpl b/view/theme/decaf-mobile/templates/jot_geotag.tpl index d828980e58..3a87346dba 100644 --- a/view/theme/decaf-mobile/templates/jot_geotag.tpl +++ b/view/theme/decaf-mobile/templates/jot_geotag.tpl @@ -1,16 +1,11 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { var lat = position.coords.latitude.toFixed(4); var lon = position.coords.longitude.toFixed(4); - $j('#jot-coord').val(lat + ', ' + lon); - $j('#profile-nolocation-wrapper').show(); + $('#jot-coord').val(lat + ', ' + lon); + $('#profile-nolocation-wrapper').show(); }); } diff --git a/view/theme/decaf-mobile/templates/settings_display_end.tpl b/view/theme/decaf-mobile/templates/settings_display_end.tpl index 4b3db00f5a..14af582162 100644 --- a/view/theme/decaf-mobile/templates/settings_display_end.tpl +++ b/view/theme/decaf-mobile/templates/settings_display_end.tpl @@ -1,7 +1,2 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - + diff --git a/view/theme/decaf-mobile/theme.php b/view/theme/decaf-mobile/theme.php index a525c4b77e..1a32fb724d 100644 --- a/view/theme/decaf-mobile/theme.php +++ b/view/theme/decaf-mobile/theme.php @@ -28,6 +28,6 @@ function decaf_mobile_content_loaded(&$a) { $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css'; } if( $a->module === 'login' ) - $a->page['end'] .= ''; + $a->page['end'] .= ''; } diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js index 241e0c2370..c3b6092f30 100644 --- a/view/theme/frost-mobile/js/acl.js +++ b/view/theme/frost-mobile/js/acl.js @@ -13,41 +13,41 @@ function ACL(backend_url, preset){ that.group_uids = []; that.nw = 2; //items per row. should be calulated from #acl-list.width - that.list_content = $j("#acl-list-content"); - that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html()); - that.showall = $j("#acl-showall"); + that.list_content = $("#acl-list-content"); + that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); + that.showall = $("#acl-showall"); if (preset.length==0) that.showall.addClass("selected"); /*events*/ that.showall.click(that.on_showall); - $j(".acl-button-show").live('click', that.on_button_show); - $j(".acl-button-hide").live('click', that.on_button_hide); - $j("#acl-search").keypress(that.on_search); - $j("#acl-wrapper").parents("form").submit(that.on_submit); + $(".acl-button-show").live('click', that.on_button_show); + $(".acl-button-hide").live('click', that.on_button_hide); + $("#acl-search").keypress(that.on_search); + $("#acl-wrapper").parents("form").submit(that.on_submit); /* startup! */ that.get(0,100); } ACL.prototype.on_submit = function(){ - aclfileds = $j("#acl-fields").html(""); - $j(that.allow_gid).each(function(i,v){ + aclfileds = $("#acl-fields").html(""); + $(that.allow_gid).each(function(i,v){ aclfileds.append(""); }); - $j(that.allow_cid).each(function(i,v){ + $(that.allow_cid).each(function(i,v){ aclfileds.append(""); }); - $j(that.deny_gid).each(function(i,v){ + $(that.deny_gid).each(function(i,v){ aclfileds.append(""); }); - $j(that.deny_cid).each(function(i,v){ + $(that.deny_cid).each(function(i,v){ aclfileds.append(""); }); } ACL.prototype.search = function(){ - var srcstr = $j("#acl-search").val(); + var srcstr = $("#acl-search").val(); that.list_content.html(""); that.get(0,100, srcstr); } @@ -82,10 +82,10 @@ ACL.prototype.on_button_show = function(event){ event.stopPropagation(); /*that.showall.removeClass("selected"); - $j(this).siblings(".acl-button-hide").removeClass("selected"); - $j(this).toggleClass("selected");*/ + $(this).siblings(".acl-button-hide").removeClass("selected"); + $(this).toggleClass("selected");*/ - that.set_allow($j(this).parent().attr('id')); + that.set_allow($(this).parent().attr('id')); return false; } @@ -95,10 +95,10 @@ ACL.prototype.on_button_hide = function(event){ event.stopPropagation(); /*that.showall.removeClass("selected"); - $j(this).siblings(".acl-button-show").removeClass("selected"); - $j(this).toggleClass("selected");*/ + $(this).siblings(".acl-button-show").removeClass("selected"); + $(this).toggleClass("selected");*/ - that.set_deny($j(this).parent().attr('id')); + that.set_deny($(this).parent().attr('id')); return false; } @@ -156,32 +156,32 @@ ACL.prototype.update_view = function(){ that.deny_gid.length==0 && that.deny_cid.length==0){ that.showall.addClass("selected"); /* jot acl */ - $j('#jot-perms-icon').removeClass('lock').addClass('unlock'); - $j('#jot-public').show(); - $j('.profile-jot-net input').attr('disabled', false); + $('#jot-perms-icon').removeClass('lock').addClass('unlock'); + $('#jot-public').show(); + $('.profile-jot-net input').attr('disabled', false); if(typeof editor != 'undefined' && editor != false) { - $j('#profile-jot-desc').html(window.isPublic); + $('#profile-jot-desc').html(window.isPublic); } } else { that.showall.removeClass("selected"); /* jot acl */ - $j('#jot-perms-icon').removeClass('unlock').addClass('lock'); - $j('#jot-public').hide(); - $j('.profile-jot-net input').attr('disabled', 'disabled'); - $j('#profile-jot-desc').html(' '); + $('#jot-perms-icon').removeClass('unlock').addClass('lock'); + $('#jot-public').hide(); + $('.profile-jot-net input').attr('disabled', 'disabled'); + $('#profile-jot-desc').html(' '); } - $j("#acl-list-content .acl-list-item").each(function(){ - $j(this).removeClass("groupshow grouphide"); + $("#acl-list-content .acl-list-item").each(function(){ + $(this).removeClass("groupshow grouphide"); }); - $j("#acl-list-content .acl-list-item").each(function(){ - itemid = $j(this).attr('id'); + $("#acl-list-content .acl-list-item").each(function(){ + itemid = $(this).attr('id'); type = itemid[0]; id = parseInt(itemid.substr(1)); - btshow = $j(this).children(".acl-button-show").removeClass("selected"); - bthide = $j(this).children(".acl-button-hide").removeClass("selected"); + btshow = $(this).children(".acl-button-show").removeClass("selected"); + bthide = $(this).children(".acl-button-hide").removeClass("selected"); switch(type){ case "g": @@ -197,16 +197,16 @@ ACL.prototype.update_view = function(){ uclass="grouphide"; } - $j(that.group_uids[id]).each(function(i,v) { + $(that.group_uids[id]).each(function(i,v) { if(uclass == "grouphide") - $j("#c"+v).removeClass("groupshow"); + $("#c"+v).removeClass("groupshow"); if(uclass != "") { - var cls = $j("#c"+v).attr('class'); + var cls = $("#c"+v).attr('class'); if( cls == undefined) return true; var hiding = cls.indexOf('grouphide'); 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, } - $j.ajax({ + $.ajax({ type:'POST', url: that.url, data: postdata, @@ -246,16 +246,16 @@ ACL.prototype.get = function(start,count, search){ ACL.prototype.populate = function(data){ /* var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height);*/ - $j(data.items).each(function(){ + $(data.items).each(function(){ html = "
"+that.item_tpl+"
"; 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; //console.log(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 - $j(el).attr('src', $j(el).data("src")); + $(el).attr('src', $(el).data("src")); }); that.update_view(); } diff --git a/view/theme/frost-mobile/js/acl.min.js b/view/theme/frost-mobile/js/acl.min.js index 3a5d07298b..01e90b0205 100644 --- a/view/theme/frost-mobile/js/acl.min.js +++ b/view/theme/frost-mobile/js/acl.min.js @@ -1 +1 @@ -function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("")});$j(that.allow_cid).each(function(i,v){aclfileds.append("")});$j(that.deny_gid).each(function(i,v){aclfileds.append("")});$j(that.deny_cid).each(function(i,v){aclfileds.append("")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(window.isPublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html(" ")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="
"+that.item_tpl+"
";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;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()}; \ No newline at end of file +function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$("#acl-list-content");that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html());that.showall=$("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$(".acl-button-show").live("click",that.on_button_show);$(".acl-button-hide").live("click",that.on_button_hide);$("#acl-search").keypress(that.on_search);$("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html("");$(that.allow_gid).each(function(i,v){aclfileds.append("")});$(that.allow_cid).each(function(i,v){aclfileds.append("")});$(that.deny_gid).each(function(i,v){aclfileds.append("")});$(that.deny_cid).each(function(i,v){aclfileds.append("")})};ACL.prototype.search=function(){var srcstr=$("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$("#jot-perms-icon").removeClass("lock").addClass("unlock");$("#jot-public").show();$(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$("#profile-jot-desc").html(window.isPublic)}}else{that.showall.removeClass("selected");$("#jot-perms-icon").removeClass("unlock").addClass("lock");$("#jot-public").hide();$(".profile-jot-net input").attr("disabled","disabled");$("#profile-jot-desc").html(" ")}$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")});$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$(this).children(".acl-button-show").removeClass("selected");bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$(data.items).each(function(){html="
"+that.item_tpl+"
";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;that.list_content.append(html)});$(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$(el).attr("src",$(el).data("src"))});that.update_view()}; \ No newline at end of file diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index f486eaf518..926de5d253 100644 --- a/view/theme/frost-mobile/js/main.js +++ b/view/theme/frost-mobile/js/main.js @@ -10,14 +10,14 @@ listID = listID.replace(/\./g, "\\."); listID = listID.replace(/@/g, "\\@"); - if($j(listID).is(":visible")) { - $j(listID).hide(); - $j(listID+"-wrapper").show(); - alert($j(listID+"-wrapper").attr("id")); + if($(listID).is(":visible")) { + $(listID).hide(); + $(listID+"-wrapper").show(); + alert($(listID+"-wrapper").attr("id")); } else { - $j(listID).show(); - $j(listID+"-wrapper").hide(); + $(listID).show(); + $(listID+"-wrapper").hide(); } } @@ -46,16 +46,16 @@ var last_popup_menu = null; var last_popup_button = null; - $j(function() { - $j.ajaxSetup({cache: false}); + $(function() { + $.ajaxSetup({cache: false}); - msie = $j.browser.msie ; + msie = $.browser.msie ; collapseHeight(); /* setup tooltips *//* - $j("a,.tt").each(function(){ - var e = $j(this); + $("a,.tt").each(function(){ + var e = $(this); var pos="bottom"; if (e.hasClass("tttop")) pos="top"; if (e.hasClass("ttbottom")) pos="bottom"; @@ -67,19 +67,19 @@ /* setup onoff widgets */ - $j(".onoff input").each(function(){ - val = $j(this).val(); - id = $j(this).attr("id"); - $j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); + $(".onoff input").each(function(){ + val = $(this).val(); + id = $(this).attr("id"); + $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); }); - $j(".onoff > a").click(function(event){ + $(".onoff > a").click(function(event){ event.preventDefault(); - var input = $j(this).siblings("input"); + var input = $(this).siblings("input"); var val = 1-input.val(); var id = input.attr("id"); - $j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); - $j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); + $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); + $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); input.val(val); //console.log(id); }); @@ -91,129 +91,129 @@ function close_last_popup_menu(e) { 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(); - 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_menu = null; last_popup_button = null; } } } - $j('img[rel^=#]').click(function(e){ + $('img[rel^=#]').click(function(e){ close_last_popup_menu(e); - menu = $j( $j(this).attr('rel') ); + menu = $( $(this).attr('rel') ); e.preventDefault(); e.stopPropagation(); if (menu.attr('popup')=="false") return false; -// $j(this).parent().toggleClass("selected"); +// $(this).parent().toggleClass("selected"); // menu.toggle(); if (menu.css("display") == "none") { - $j(this).parent().addClass("selected"); + $(this).parent().addClass("selected"); 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_button = $j(this).parent(); + last_popup_button = $(this).parent(); } else { - $j(this).parent().removeClass("selected"); + $(this).parent().removeClass("selected"); 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_button = null; } return false; }); - $j('html').click(function(e) { + $('html').click(function(e) { close_last_popup_menu(e); }); // fancyboxes - /*$j("a.popupbox").colorbox({ + /*$("a.popupbox").colorbox({ 'inline' : true, 'transition' : 'none' });*/ /* notifications template */ - var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html()); - var notifications_all = unescape($j('
').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack - var notifications_mark = unescape($j('
').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack - var notifications_empty = unescape($j("#nav-notifications-menu").html()); + var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); + var notifications_all = unescape($('
').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack + var notifications_mark = unescape($('
').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack + var notifications_empty = unescape($("#nav-notifications-menu").html()); /* nav update event */ - $j('nav').bind('nav-update', function(e,data){; - var invalid = $j(data).find('invalid').text(); + $('nav').bind('nav-update', function(e,data){; + var invalid = $(data).find('invalid').text(); if(invalid == 1) { window.location.href=window.location.href } - var net = $j(data).find('net').text(); - if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') } - $j('#net-update').html(net); + var net = $(data).find('net').text(); + if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') } + $('#net-update').html(net); - var home = $j(data).find('home').text(); - if(home == 0) { home = ''; $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') } - $j('#home-update').html(home); + var home = $(data).find('home').text(); + if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } + $('#home-update').html(home); - var intro = $j(data).find('intro').text(); - if(intro == 0) { intro = ''; $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') } - $j('#intro-update').html(intro); + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } + $('#intro-update').html(intro); - var mail = $j(data).find('mail').text(); - if(mail == 0) { mail = ''; $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') } - $j('#mail-update').html(mail); + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } + $('#mail-update').html(mail); - var intro = $j(data).find('intro').text(); - if(intro == 0) { intro = ''; $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') } - $j('#intro-update-li').html(intro); + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); - var mail = $j(data).find('mail').text(); - if(mail == 0) { mail = ''; $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') } - $j('#mail-update-li').html(mail); + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); - var eNotif = $j(data).find('notif') + var eNotif = $(data).find('notif') if (eNotif.children("note").length==0){ - $j("#nav-notifications-menu").html(notifications_empty); + $("#nav-notifications-menu").html(notifications_empty); } else { - nnm = $j("#nav-notifications-menu"); + nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); //nnm.attr('popup','true'); eNotif.children("note").each(function(){ - e = $j(this); + e = $(this); text = e.text().format(""+e.attr('name')+""); html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); 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 // However, don't bother if the data-src attribute is empty, because // an empty "src" tag for an image will cause some browsers // to prefetch the root page of the Friendica hub, which will // 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'); if (notif>0){ - $j("#nav-notifications-linkmenu").addClass("on"); + $("#nav-notifications-linkmenu").addClass("on"); } 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') } - $j('#notify-update').html(notif); + if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } + $('#notify-update').html(notif); - var eSysmsg = $j(data).find('sysmsgs'); + var eSysmsg = $(data).find('sysmsgs'); eSysmsg.children("notice").each(function(){ - text = $j(this).text(); - $j.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 }); + text = $(this).text(); + $.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 }); }); eSysmsg.children("info").each(function(){ - text = $j(this).text(); - $j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 }); + text = $(this).text(); + $.jGrowl(text, { sticky: false, theme: 'info', life: 1000 }); }); }); @@ -221,7 +221,7 @@ NavUpdate(); // 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') { var target = event.target || event.srcElement; if (!/input|textarea/i.test(target.nodeName)) { @@ -235,7 +235,7 @@ if (event.ctrlKey) { totStopped = true; } - $j('#pause').html('pause'); + $('#pause').html('pause'); } else { unpause(); } @@ -253,28 +253,28 @@ if(! stopped) { var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); - $j.get(pingCmd,function(data) { - $j(data).find('result').each(function() { + $.get(pingCmd,function(data) { + $(data).find('result').each(function() { // send nav-update event - $j('nav').trigger('nav-update', this); + $('nav').trigger('nav-update', this); // start live update - if($j('#live-network').length) { src = 'network'; liveUpdate(); } - if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } - if($j('#live-community').length) { src = 'community'; liveUpdate(); } - if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } - if($j('#live-display').length) { src = 'display'; liveUpdate(); } - /*if($j('#live-display').length) { + if($('#live-network').length) { src = 'network'; liveUpdate(); } + if($('#live-profile').length) { src = 'profile'; liveUpdate(); } + if($('#live-community').length) { src = 'community'; liveUpdate(); } + if($('#live-notes').length) { src = 'notes'; liveUpdate(); } + if($('#live-display').length) { src = 'display'; liveUpdate(); } + /*if($('#live-display').length) { if(liking) { liking = 0; window.location.href=window.location.href } }*/ - if($j('#live-photos').length) { + if($('#live-photos').length) { if(liking) { liking = 0; window.location.href=window.location.href @@ -291,8 +291,8 @@ } function liveUpdate() { - if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; } - if(($j('.comment-edit-text-full').length) || (in_progress)) { + if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $('.like-rotator').hide(); return; } + if(($('.comment-edit-text-full').length) || (in_progress)) { if(livetime) { clearTimeout(livetime); } @@ -308,50 +308,50 @@ var udargs = ((netargs.length) ? '/' + netargs : ''); 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; - // $j('.collapsed-comments',data).each(function() { - // var ident = $j(this).attr('id'); - // var is_hidden = $j('#' + ident).is(':hidden'); - // if($j('#' + ident).length) { - // $j('#' + ident).replaceWith($j(this)); + // $('.collapsed-comments',data).each(function() { + // var ident = $(this).attr('id'); + // var is_hidden = $('#' + ident).is(':hidden'); + // if($('#' + ident).length) { + // $('#' + ident).replaceWith($(this)); // if(is_hidden) - // $j('#' + ident).hide(); + // $('#' + ident).hide(); // } //}); // add a new thread - $j('.toplevel_item',data).each(function() { - var ident = $j(this).attr('id'); + $('.toplevel_item',data).each(function() { + var ident = $(this).attr('id'); - if($j('#' + ident).length == 0 && profile_page == 1) { - $j('img',this).each(function() { - $j(this).attr('src',$j(this).attr('dst')); + if($('#' + ident).length == 0 && profile_page == 1) { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); }); - $j('#' + prev).after($j(this)); + $('#' + prev).after($(this)); } else { // Find out if the hidden comments are open, so we can keep it that way // 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') { id = id.split('-')[3]; - var commentsOpen = $j("#collapsed-comments-" + id).is(":visible"); + var commentsOpen = $("#collapsed-comments-" + id).is(":visible"); } - $j('img',this).each(function() { - $j(this).attr('src',$j(this).attr('dst')); + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); }); - //vScroll = $j(document).scrollTop(); - $j('html').height($j('html').height()); - $j('#' + ident).replaceWith($j(this)); + //vScroll = $(document).scrollTop(); + $('html').height($('html').height()); + $('#' + ident).replaceWith($(this)); if(typeof id != 'undefined') { if(commentsOpen) showHideComments(id); } - $j('html').height('auto'); - //$j(document).scrollTop(vScroll); + $('html').height('auto'); + //$(document).scrollTop(vScroll); } prev = ident; }); @@ -363,36 +363,36 @@ /*prev = 'live-' + src; - $j('.wall-item-outside-wrapper',data).each(function() { - var ident = $j(this).attr('id'); + $('.wall-item-outside-wrapper',data).each(function() { + var ident = $(this).attr('id'); - if($j('#' + ident).length == 0 && prev != 'live-' + src) { - $j('img',this).each(function() { - $j(this).attr('src',$j(this).attr('dst')); + if($('#' + ident).length == 0 && prev != 'live-' + src) { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); }); - $j('#' + prev).after($j(this)); + $('#' + prev).after($(this)); } else { - $j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); - if($j('#' + ident + ' ' + '.comment-edit-text-empty').length) - $j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper')); - $j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total')); - $j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like')); - $j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike')); - $j('#' + ident + ' ' + '.my-comment-photo').each(function() { - $j(this).attr('src',$j(this).attr('dst')); + $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); + if($('#' + ident + ' ' + '.comment-edit-text-empty').length) + $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper')); + $('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total')); + $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like')); + $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike')); + $('#' + ident + ' ' + '.my-comment-photo').each(function() { + $(this).attr('src',$(this).attr('dst')); }); } prev = ident; });*/ - $j('.like-rotator').hide(); + $('.like-rotator').hide(); if(commentBusy) { commentBusy = false; - $j('body').css('cursor', 'auto'); + $('body').css('cursor', 'auto'); } /* 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 if(typeof videojs != 'undefined') videojs.autoSetup(); @@ -404,22 +404,22 @@ if(typeof elems != 'undefined') { elemName = elems + ' ' + elemName; } - $j(elemName).each(function() { - if($j(this).height() > 350) { - $j('html').height($j('html').height()); - $j(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 }); - $j(this).addClass('divmore'); - $j('html').height('auto'); + $(elemName).each(function() { + if($(this).height() > 350) { + $('html').height($('html').height()); + $(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 }); + $(this).addClass('divmore'); + $('html').height('auto'); } }); } /* function imgbright(node) { - $j(node).removeClass("drophide").addClass("drop"); + $(node).removeClass("drophide").addClass("drop"); } 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 @@ -434,8 +434,8 @@ function dolike(ident,verb) { unpause(); - $j('#like-rotator-' + ident.toString()).show(); - $j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); + $('#like-rotator-' + ident.toString()).show(); + $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; @@ -443,21 +443,21 @@ function dostar(ident) { ident = ident.toString(); - //$j('#like-rotator-' + ident).show(); - $j.get('starred/' + ident, function(data) { + //$('#like-rotator-' + ident).show(); + $.get('starred/' + ident, function(data) { if(data.match(/1/)) { - $j('#starred-' + ident).addClass('starred'); - $j('#starred-' + ident).removeClass('unstarred'); - $j('#star-' + ident).addClass('hidden'); - $j('#unstar-' + ident).removeClass('hidden'); + $('#starred-' + ident).addClass('starred'); + $('#starred-' + ident).removeClass('unstarred'); + $('#star-' + ident).addClass('hidden'); + $('#unstar-' + ident).removeClass('hidden'); } else { - $j('#starred-' + ident).addClass('unstarred'); - $j('#starred-' + ident).removeClass('starred'); - $j('#star-' + ident).removeClass('hidden'); - $j('#unstar-' + ident).addClass('hidden'); + $('#starred-' + ident).addClass('unstarred'); + $('#starred-' + ident).removeClass('starred'); + $('#star-' + ident).removeClass('hidden'); + $('#unstar-' + ident).addClass('hidden'); } - //$j('#like-rotator-' + ident).hide(); + //$('#like-rotator-' + ident).hide(); }); } @@ -492,31 +492,31 @@ } else { lockvisible = true; - $j.get('lockview/' + id, function(data) { - $j('#panel').html(data); - $j('#panel').css({ 'left': 10 , 'top': cursor.y + 20}); - $j('#panel').show(); + $.get('lockview/' + id, function(data) { + $('#panel').html(data); + $('#panel').css({ 'left': 10 , 'top': cursor.y + 20}); + $('#panel').show(); }); } } function lockviewhide() { lockvisible = false; - $j('#panel').hide(); + $('#panel').hide(); } function post_comment(id) { unpause(); commentBusy = true; - $j('body').css('cursor', 'wait'); - $j("#comment-preview-inp-" + id).val("0"); - $j.post( + $('body').css('cursor', 'wait'); + $("#comment-preview-inp-" + id).val("0"); + $.post( "item", - $j("#comment-edit-form-" + id).serialize(), + $("#comment-edit-form-" + id).serialize(), function(data) { if(data.success) { - $j("#comment-edit-wrapper-" + id).hide(); - $j("#comment-edit-text-" + id).val(''); + $("#comment-edit-wrapper-" + id).hide(); + $("#comment-edit-text-" + id).val(''); var tarea = document.getElementById("comment-edit-text-" + id); if(tarea) commentClose(tarea,id); @@ -534,16 +534,16 @@ function preview_comment(id) { - $j("#comment-preview-inp-" + id).val("1"); - $j("#comment-edit-preview-" + id).show(); - $j.post( + $("#comment-preview-inp-" + id).val("1"); + $("#comment-edit-preview-" + id).show(); + $.post( "item", - $j("#comment-edit-form-" + id).serialize(), + $("#comment-edit-form-" + id).serialize(), function(data) { if(data.preview) { - $j("#comment-edit-preview-" + id).html(data.preview); - $j("#comment-edit-preview-" + id + " a").click(function() { return false; }); + $("#comment-edit-preview-" + id).html(data.preview); + $("#comment-edit-preview-" + id + " a").click(function() { return false; }); } }, "json" @@ -553,34 +553,34 @@ function showHideComments(id) { - if( $j("#collapsed-comments-" + id).is(":visible")) { - $j("#collapsed-comments-" + id).hide(); - $j("#hide-comments-" + id).html(window.showMore); + if( $("#collapsed-comments-" + id).is(":visible")) { + $("#collapsed-comments-" + id).hide(); + $("#hide-comments-" + id).html(window.showMore); } else { - $j("#collapsed-comments-" + id).show(); - $j("#hide-comments-" + id).html(window.showFewer); + $("#collapsed-comments-" + id).show(); + $("#hide-comments-" + id).html(window.showFewer); collapseHeight("#collapsed-comments-" + id); } } function preview_post() { - $j("#jot-preview").val("1"); - $j("#jot-preview-content").show(); + $("#jot-preview").val("1"); + $("#jot-preview-content").show(); tinyMCE.triggerSave(); - $j.post( + $.post( "item", - $j("#profile-jot-form").serialize(), + $("#profile-jot-form").serialize(), function(data) { if(data.preview) { - $j("#jot-preview-content").html(data.preview); - $j("#jot-preview-content" + " a").click(function() { return false; }); + $("#jot-preview-content").html(data.preview); + $("#jot-preview-content" + " a").click(function() { return false; }); } }, "json" ); - $j("#jot-preview").val("0"); + $("#jot-preview").val("0"); return true; } @@ -589,7 +589,7 @@ // unpause auto reloads if they are currently stopped totStopped = false; stopped = false; - $j('#pause').html(''); + $('#pause').html(''); } @@ -617,40 +617,40 @@ } function groupChangeMember(gid, cid, sec_token) { - $j('body .fakelink').css('cursor', 'wait'); - $j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { - $j('#group-update-wrapper').html(data); - $j('body .fakelink').css('cursor', 'auto'); + $('body .fakelink').css('cursor', 'wait'); + $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { + $('#group-update-wrapper').html(data); + $('body .fakelink').css('cursor', 'auto'); }); } function profChangeMember(gid,cid) { - $j('body .fakelink').css('cursor', 'wait'); - $j.get('profperm/' + gid + '/' + cid, function(data) { - $j('#prof-update-wrapper').html(data); - $j('body .fakelink').css('cursor', 'auto'); + $('body .fakelink').css('cursor', 'wait'); + $.get('profperm/' + gid + '/' + cid, function(data) { + $('#prof-update-wrapper').html(data); + $('body .fakelink').css('cursor', 'auto'); }); } function contactgroupChangeMember(gid,cid) { - $j('body').css('cursor', 'wait'); - $j.get('contactgroup/' + gid + '/' + cid, function(data) { - $j('body').css('cursor', 'auto'); + $('body').css('cursor', 'wait'); + $.get('contactgroup/' + gid + '/' + cid, function(data) { + $('body').css('cursor', 'auto'); }); } function checkboxhighlight(box) { - if($j(box).is(':checked')) { - $j(box).addClass('checkeditem'); + if($(box).is(':checked')) { + $(box).addClass('checkeditem'); } else { - $j(box).removeClass('checkeditem'); + $(box).removeClass('checkeditem'); } } function notifyMarkAll() { - $j.get('notify/mark/all', function(data) { + $.get('notify/mark/all', function(data) { if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,1000); }); @@ -729,9 +729,9 @@ Array.prototype.remove = function(item) { }; function previewTheme(elm) { - theme = $j(elm).val(); - $j.getJSON('pretheme?f=&theme=' + theme,function(data) { - $j('#theme-preview').html('
' + data.desc + '
' + data.version + '
' + data.credits + '
'); + theme = $(elm).val(); + $.getJSON('pretheme?f=&theme=' + theme,function(data) { + $('#theme-preview').html('
' + data.desc + '
' + data.version + '
' + data.credits + '
'); }); } diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js index f19daa71af..eaf8a082d7 100644 --- a/view/theme/frost-mobile/js/main.min.js +++ b/view/theme/frost-mobile/js/main.min.js @@ -1 +1 @@ -function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format(""+e.attr("name")+"");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){if($j(el).data("src")!="")$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||typeof profile_uid=="undefined"||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");if(typeof videojs!="undefined")videojs.autoSetup()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:10,top:cursor.y+20});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+"
")})} \ No newline at end of file +function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($(listID).is(":visible")){$(listID).hide();$(listID+"-wrapper").show();alert($(listID+"-wrapper").attr("id"))}else{$(listID).show();$(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;collapseHeight();$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$(".main-container").hide();last_popup_menu=menu;last_popup_button=$(this).parent()}else{$(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("
").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("
").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(this);text=e.text().format(""+e.attr("name")+"");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$("img[data-src]",nnm).each(function(i,el){if($(el).data("src")!="")$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||typeof profile_uid=="undefined"||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});collapseHeight();$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");if(typeof videojs!="undefined")videojs.autoSetup()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$(elemName).each(function(){if($(this).height()>350){$("html").height($("html").height());$(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$(this).addClass("divmore");$("html").height("auto")}})}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:10,top:cursor.y+20});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+"
")})} \ No newline at end of file diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js index bb0d9dcccd..8133c602c8 100644 --- a/view/theme/frost-mobile/js/theme.js +++ b/view/theme/frost-mobile/js/theme.js @@ -1,60 +1,60 @@ -$j(document).ready(function() { +$(document).ready(function() { /* enable tinymce on focus and click */ - $j("#profile-jot-text").focus(enableOnUser); - $j("#profile-jot-text").click(enableOnUser); + $("#profile-jot-text").focus(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() { - $j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, + $(this).addClass('icon'); $(this).removeClass('iconspacer');}, 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() { - id = $j(this).attr('id'); - $j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');}, + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, function() { - id = $j(this).attr('id'); - $j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');} + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} ); - $j('.savedsearchdrop').hover( + $('.savedsearchdrop').hover( function() { - $j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');}, + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, 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() { - id = $j(this).attr('id'); - $j('#drop-' + id).addClass('icon'); $j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');}, + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, function() { - id = $j(this).attr('id'); - $j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');} + id = $(this).attr('id'); + $('#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')) { - $j('#acl-wrapper').show(); + if ($('#event-share-checkbox').is(':checked')) { + $('#acl-wrapper').show(); } else { - $j('#acl-wrapper').hide(); + $('#acl-wrapper').hide(); } }).trigger('change'); - $j(".popupbox").click(function () { - var parent = $j( $j(this).attr('href') ).parent(); + $(".popupbox").click(function () { + var parent = $( $(this).attr('href') ).parent(); if (parent.css('display') == 'none') { parent.show(); } else { @@ -70,23 +70,23 @@ $j(document).ready(function() { window.imageUploadButton, { action: 'wall_upload/'+window.nickname+'?nomce=1', name: 'userfile', - onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,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( 'wall-file-upload', { action: 'wall_attach/'+window.nickname+'?nomce=1', name: 'userfile', - onSubmit: function(file,ext) { $j('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { addeditortext(window.jotId, response); - $j('#profile-rotator').hide(); + $('#profile-rotator').hide(); } } ); @@ -103,17 +103,17 @@ $j(document).ready(function() { switch(window.autocompleteType) { case 'msg-header': - var a = $j("#recip").autocomplete({ + var a = $("#recip").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, width: 350, onSelect: function(value,data) { - $j("#recip-complete").val(data); + $("#recip-complete").val(data); } }); break; case 'contacts-head': - var a = $j("#contacts-search").autocomplete({ + var a = $("#contacts-search").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, width: 350, @@ -121,7 +121,7 @@ $j(document).ready(function() { a.setOptions({ params: { type: 'a' }}); break; case 'display-head': - $j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); break; default: break; @@ -129,31 +129,31 @@ $j(document).ready(function() { /* 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 - //$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); - $j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + //$(".wall-item-comment-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") { - $j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { + $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; - $j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $j(this).text(); - $j('#jot-perms-icon').removeClass('unlock').addClass('lock'); - $j('#jot-public').hide(); + $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { + selstr = $(this).text(); + $('#jot-perms-icon').removeClass('unlock').addClass('lock'); + $('#jot-public').hide(); }); if(selstr == null) { - $j('#jot-perms-icon').removeClass('lock').addClass('unlock'); - $j('#jot-public').show(); + $('#jot-perms-icon').removeClass('lock').addClass('unlock'); + $('#jot-public').show(); } }).trigger('change'); } if(window.aclType == "event_head") { - $j('#events-calendar').fullCalendar({ + $('#events-calendar').fullCalendar({ events: baseurl + '/events/json/', header: { left: 'prev,next today', @@ -203,7 +203,7 @@ $j(document).ready(function() { // center on date var args=location.href.replace(baseurl,"").split("/"); 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 @@ -214,11 +214,11 @@ $j(document).ready(function() { }); // update pending count // -$j(function(){ +$(function(){ - $j("nav").bind('nav-update', function(e,data){ - var elm = $j('#pending-update'); - var register = $j(data).find('register').text(); + $("nav").bind('nav-update', function(e,data){ + var elm = $('#pending-update'); + var register = $(data).find('register').text(); if (register=="0") { register=""; elm.hide();} else { elm.show(); } elm.html(register); }); @@ -227,7 +227,7 @@ $j(function(){ function homeRedirect() { - $j('html').fadeOut('slow', function(){ + $('html').fadeOut('slow', function(){ window.location = baseurl + "/login"; }); } @@ -235,12 +235,12 @@ function homeRedirect() { function initCrop() { function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + $PR( 'x1' ).value = coords.x1; + $PR( 'y1' ).value = coords.y1; + $PR( 'x2' ).value = coords.x2; + $PR( 'y2' ).value = coords.y2; + $PR( 'width' ).value = dimensions.width; + $PR( 'height' ).value = dimensions.height; } Event.observe( window, 'load', function() { @@ -261,10 +261,10 @@ function initCrop() { function showEvent(eventid) { -/* $j.get( +/* $.get( baseurl + '/events/?id='+eventid, function(data){ - $j.colorbox({html:data}); + $.colorbox({html:data}); } );*/ } @@ -282,27 +282,27 @@ var plaintext = 'none';//window.editSelect; function initEditor(cb){ if (editor==false){ -// $j("#profile-jot-text-loading").show(); +// $("#profile-jot-text-loading").show(); if(plaintext == 'none') { -// $j("#profile-jot-text-loading").hide(); - $j("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); +// $("#profile-jot-text-loading").hide(); + $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; -/* $j("a#jot-perms-icon").colorbox({ +/* $("a#jot-perms-icon").colorbox({ 'inline' : true, 'transition' : 'elastic' });*/ - $j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { - var parent = $j("#profile-jot-acl-wrapper").parent(); + $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { + var parent = $("#profile-jot-acl-wrapper").parent(); if (parent.css('display') == 'none') { parent.show(); } else { parent.hide(); } -// $j("#profile-jot-acl-wrapper").parent().toggle(); +// $("#profile-jot-acl-wrapper").parent().toggle(); return false; }); - $j(".jothidden").show(); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); return; } @@ -352,37 +352,37 @@ function initEditor(cb){ } textlen = txt.length; - if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) { - $j('#profile-jot-desc').html(ispublic); + if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { + $('#profile-jot-desc').html(ispublic); } else { - $j('#profile-jot-desc').html(' '); + $('#profile-jot-desc').html(' '); } //Character count if(textlen <= 140) { - $j('#character-counter').removeClass('red'); - $j('#character-counter').removeClass('orange'); - $j('#character-counter').addClass('grey'); + $('#character-counter').removeClass('red'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('grey'); } if((textlen > 140) && (textlen <= 420)) { - $j('#character-counter').removeClass('grey'); - $j('#character-counter').removeClass('red'); - $j('#character-counter').addClass('orange'); + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('red'); + $('#character-counter').addClass('orange'); } if(textlen > 420) { - $j('#character-counter').removeClass('grey'); - $j('#character-counter').removeClass('orange'); - $j('#character-counter').addClass('red'); + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('red'); } - $j('#character-counter').text(textlen); + $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $j("#profile-jot-text-loading").hide(); - $j(".jothidden").show(); + $("#profile-jot-text-loading").hide(); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -390,7 +390,7 @@ function initEditor(cb){ }); editor = true; // setup acl popup - $j("a#jot-perms-icon").colorbox({ + $("a#jot-perms-icon").colorbox({ 'inline' : true, 'transition' : 'elastic' }); */ @@ -401,7 +401,7 @@ function initEditor(cb){ function enableOnUser(){ if (editor) return; - $j(this).val(""); + $(this).val(""); initEditor(); } @@ -436,9 +436,9 @@ function enableOnUser(){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; var editorId = ed.editorId; - var textarea = $j('#'+editorId); + var textarea = $('#'+editorId); 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); } }); @@ -446,7 +446,7 @@ function enableOnUser(){ }); } else - $j("#prvmail-text").contact_autocomplete(baseurl+"/acl"); + $("#prvmail-text").contact_autocomplete(baseurl+"/acl"); }*/ @@ -457,8 +457,8 @@ function enableOnUser(){ function addeditortext(textElem, data) { if(window.editSelect == 'none') { - var currentText = $j(textElem).val(); - $j(textElem).val(currentText + data); + var currentText = $(textElem).val(); + $(textElem).val(currentText + data); } /* else tinyMCE.execCommand('mceInsertRawHTML',false,data);*/ @@ -480,22 +480,22 @@ function jotAudioURL() { function jotGetLocation() { - reply = prompt(window.whereAreU, $j('#jot-location').val()); + reply = prompt(window.whereAreU, $('#jot-location').val()); if(reply && reply.length) { - $j('#jot-location').val(reply); + $('#jot-location').val(reply); } } 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(); - $j.get('share/' + id, function(data) { - if (!editor) $j("#profile-jot-text").val(""); + $('#like-rotator-' + id).show(); + $.get('share/' + id, function(data) { + if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext("#profile-jot-text", data); - $j('#like-rotator-' + id).hide(); - $j(window).scrollTop(0); + $('#like-rotator-' + id).hide(); + $(window).scrollTop(0); }); }); @@ -505,10 +505,10 @@ function jotGetLink() { reply = prompt(window.linkURL); if(reply && reply.length) { reply = bin2hex(reply); - $j('#profile-rotator').show(); - $j.get('parse_url?binurl=' + reply, function(data) { + $('#profile-rotator').show(); + $.get('parse_url?binurl=' + reply, function(data) { addeditortext(window.jotId, data); - $j('#profile-rotator').hide(); + $('#profile-rotator').hide(); }); } } @@ -525,20 +525,20 @@ function linkdrop(event) { event.preventDefault(); if(reply && reply.length) { reply = bin2hex(reply); - $j('#profile-rotator').show(); - $j.get('parse_url?binurl=' + reply, function(data) { - //if (!editor) $j("#profile-jot-text").val(""); + $('#profile-rotator').show(); + $.get('parse_url?binurl=' + reply, function(data) { + //if (!editor) $("#profile-jot-text").val(""); //initEditor(function(){ addeditortext(window.jotId, data); - $j('#profile-rotator').hide(); + $('#profile-rotator').hide(); //}); }); } }*/ function jotClearLocation() { - $j('#jot-coord').val(''); - $j('#profile-nolocation-wrapper').hide(); + $('#jot-coord').val(''); + $('#profile-nolocation-wrapper').hide(); } if(typeof window.geoTag === 'function') window.geoTag(); @@ -554,17 +554,17 @@ function confirmDelete() { return confirm(window.delItem); } /*function deleteCheckedItems() { var checkedstr = ''; - $j('.item-select').each( function() { - if($j(this).is(':checked')) { + $('.item-select').each( function() { + if($(this).is(':checked')) { if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $j(this).val(); + checkedstr = checkedstr + ',' + $(this).val(); } else { - checkedstr = $j(this).val(); + checkedstr = $(this).val(); } } }); - $j.post('item', { dropitems: checkedstr }, function(data) { + $.post('item', { dropitems: checkedstr }, function(data) { window.location.reload(); }); }*/ @@ -576,9 +576,9 @@ function itemTag(id) { if(reply.length) { 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); timer = setTimeout(NavUpdate,3000);*/ liking = 1; @@ -588,46 +588,46 @@ function itemTag(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); if(reply && reply.length) { commentBusy = true; - $j('body').css('cursor', 'wait'); - $j.get('filer/' + id + '?term=' + reply, NavUpdate); + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply, NavUpdate); /* if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000);*/ 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){ - $j.colorbox({html:data}); - $j("#id_term").keypress(function(){ - $j(this).css("border-color",bordercolor); + $.get('filer/', function(data){ + $.colorbox({html:data}); + $("#id_term").keypress(function(){ + $(this).css("border-color",bordercolor); }) - $j("#select_term").change(function(){ - $j("#id_term").css("border-color",bordercolor); + $("#select_term").change(function(){ + $("#id_term").css("border-color",bordercolor); }) - $j("#filer_save").click(function(e){ + $("#filer_save").click(function(e){ e.preventDefault(); - reply = $j("#id_term").val(); + reply = $("#id_term").val(); if(reply && reply.length) { commentBusy = true; - $j('body').css('cursor', 'wait'); - $j.get('filer/' + id + '?term=' + reply); + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); liking = 1; - $j.colorbox.close(); + $.colorbox.close(); } else { - $j("#id_term").css("border-color","#FF0000"); + $("#id_term").css("border-color","#FF0000"); } return false; }); @@ -645,75 +645,75 @@ function itemFiler(id) { function commentOpen(obj,id) { if(obj.value == window.commentEmptyText) { obj.value = ""; - $j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - $j("#mod-cmnt-wrap-" + id).show(); + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#mod-cmnt-wrap-" + id).show(); openMenu("comment-edit-submit-wrapper-" + id); } } function commentClose(obj,id) { if(obj.value == "") { obj.value = window.commentEmptyText; - $j("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); - $j("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); - $j("#mod-cmnt-wrap-" + id).hide(); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); + $("#mod-cmnt-wrap-" + id).hide(); closeMenu("comment-edit-submit-wrapper-" + id); } } function commentInsert(obj,id) { - var tmpStr = $j("#comment-edit-text-" + id).val(); + var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == window.commentEmptyText) { tmpStr = ""; - $j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } - var ins = $j(obj).html(); + var ins = $(obj).html(); ins = ins.replace("<","<"); ins = ins.replace(">",">"); ins = ins.replace("&","&"); ins = ins.replace(""",'"'); - $j("#comment-edit-text-" + id).val(tmpStr + ins); + $("#comment-edit-text-" + id).val(tmpStr + ins); } function qCommentInsert(obj,id) { - var tmpStr = $j("#comment-edit-text-" + id).val(); + var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == window.commentEmptyText) { tmpStr = ""; - $j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } - var ins = $j(obj).val(); + var ins = $(obj).val(); ins = ins.replace("<","<"); ins = ins.replace(">",">"); ins = ins.replace("&","&"); ins = ins.replace(""",'"'); - $j("#comment-edit-text-" + id).val(tmpStr + ins); - $j(obj).val(""); + $("#comment-edit-text-" + id).val(tmpStr + ins); + $(obj).val(""); } /*function showHideCommentBox(id) { - if( $j('#comment-edit-form-' + id).is(':visible')) { - $j('#comment-edit-form-' + id).hide(); + if( $('#comment-edit-form-' + id).is(':visible')) { + $('#comment-edit-form-' + id).hide(); } else { - $j('#comment-edit-form-' + id).show(); + $('#comment-edit-form-' + id).show(); } }*/ function insertFormatting(comment,BBcode,id) { - var tmpStr = $j("#comment-edit-text-" + id).val(); + var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; - $j("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); 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); @@ -736,10 +736,10 @@ function insertFormatting(comment,BBcode,id) { } function cmtBbOpen(id) { - $j(".comment-edit-bb-" + id).show(); + $(".comment-edit-bb-" + id).show(); } function cmtBbClose(id) { - $j(".comment-edit-bb-" + id).hide(); + $(".comment-edit-bb-" + id).hide(); } diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js index 47b0bb9b87..9cb4930fcb 100644 --- a/view/theme/frost-mobile/js/theme.min.js +++ b/view/theme/frost-mobile/js/theme.min.js @@ -1 +1 @@ -$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}});if($j("#wall-file-upload").length){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}})}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;case"display-head":$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");break;default:break}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("{1}

{2}

{3}

".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("{1}

{2}

{3}

".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showEvent(eventid){}var editor=false;var textlen=0;var plaintext="none";function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$j(textElem).val();$j(textElem).val(currentText+data)}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext("#profile-jot-text",data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(window.jotId,data);$j("#profile-rotator").hide()})}}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()} \ No newline at end of file +$(document).ready(function(){$("#profile-jot-text").focus(enableOnUser);$("#profile-jot-text").click(enableOnUser);$("#event-share-checkbox").change(function(){if($("#event-share-checkbox").is(":checked")){$("#acl-wrapper").show()}else{$("#acl-wrapper").hide()}}).trigger("change");$(".popupbox").click(function(){var parent=$($(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$("#profile-rotator").hide()}});if($("#wall-file-upload").length){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$("#profile-rotator").hide()}})}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}switch(window.autocompleteType){case"msg-header":var a=$("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$("#recip-complete").val(data)}});break;case"contacts-head":var a=$("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;case"display-head":$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");break;default:break}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$(this).text();$("#jot-perms-icon").removeClass("unlock").addClass("lock");$("#jot-public").hide()});if(selstr==null){$("#jot-perms-icon").removeClass("lock").addClass("unlock");$("#jot-public").show()}}).trigger("change")}if(window.aclType=="event_head"){$("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("{1}

{2}

{3}

".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("{1}

{2}

{3}

".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}});$(function(){$("nav").bind("nav-update",function(e,data){var elm=$("#pending-update");var register=$(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function initCrop(){function onEndCrop(coords,dimensions){$PR("x1").value=coords.x1;$PR("y1").value=coords.y1;$PR("x2").value=coords.x2;$PR("y2").value=coords.y2;$PR("width").value=dimensions.width;$PR("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showEvent(eventid){}var editor=false;var textlen=0;var plaintext="none";function initEditor(cb){if(editor==false){if(plaintext=="none"){$("#profile-jot-text").css({height:200,color:"#000"});$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$(this).val("");initEditor()}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$(textElem).val();$(textElem).val(currentText+data)}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$("#jot-location").val());if(reply&&reply.length){$("#jot-location").val(reply)}}function jotShare(id){if($("#jot-popup").length!=0)$("#jot-popup").show();$("#like-rotator-"+id).show();$.get("share/"+id,function(data){if(!editor)$("#profile-jot-text").val("");initEditor(function(){addeditortext("#profile-jot-text",data);$("#like-rotator-"+id).hide();$(window).scrollTop(0)})})}function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$("#profile-rotator").show();$.get("parse_url?binurl="+reply,function(data){addeditortext(window.jotId,data);$("#profile-rotator").hide()})}}function jotClearLocation(){$("#jot-coord").val("");$("#profile-nolocation-wrapper").hide()}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$("body").css("cursor","wait");$.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$.get("filer/",function(data){var promptText=$("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$("body").css("cursor","wait");$.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$("#comment-edit-text-"+id).val(tmpStr+ins);$(obj).val("")}function insertFormatting(comment,BBcode,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$(".comment-edit-bb-"+id).hide()} \ No newline at end of file diff --git a/view/theme/frost-mobile/templates/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl index 4d88670c17..f0c4869a70 100644 --- a/view/theme/frost-mobile/templates/admin_users.tpl +++ b/view/theme/frost-mobile/templates/admin_users.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/frost-mobile/templates/cropbody.tpl b/view/theme/frost-mobile/templates/cropbody.tpl index 5ace9a1aaf..2678488e7d 100644 --- a/view/theme/frost-mobile/templates/cropbody.tpl +++ b/view/theme/frost-mobile/templates/cropbody.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

{{$desc}} diff --git a/view/theme/frost-mobile/templates/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl index 7a828815b9..a56c71d92e 100644 --- a/view/theme/frost-mobile/templates/cropend.tpl +++ b/view/theme/frost-mobile/templates/cropend.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/frost-mobile/templates/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl index 6438cfb354..56e941e3ab 100644 --- a/view/theme/frost-mobile/templates/crophead.tpl +++ b/view/theme/frost-mobile/templates/crophead.tpl @@ -1,6 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl index 435c190fb9..e1a6bc542f 100644 --- a/view/theme/frost-mobile/templates/end.tpl +++ b/view/theme/frost-mobile/templates/end.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} @@ -11,7 +6,6 @@ tinyMCE.init({ mode : "none"}); -->*}} - {{**}} - - diff --git a/view/theme/frost/templates/jot_geotag.tpl b/view/theme/frost/templates/jot_geotag.tpl index d828980e58..3a87346dba 100644 --- a/view/theme/frost/templates/jot_geotag.tpl +++ b/view/theme/frost/templates/jot_geotag.tpl @@ -1,16 +1,11 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { var lat = position.coords.latitude.toFixed(4); var lon = position.coords.longitude.toFixed(4); - $j('#jot-coord').val(lat + ', ' + lon); - $j('#profile-nolocation-wrapper').show(); + $('#jot-coord').val(lat + ', ' + lon); + $('#profile-nolocation-wrapper').show(); }); } diff --git a/view/theme/frost/templates/settings_display_end.tpl b/view/theme/frost/templates/settings_display_end.tpl index 4b3db00f5a..14af582162 100644 --- a/view/theme/frost/templates/settings_display_end.tpl +++ b/view/theme/frost/templates/settings_display_end.tpl @@ -1,7 +1,2 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - + diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 3decb2a118..868a840dee 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -26,7 +26,7 @@ function frost_content_loaded(&$a) { $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost/login-style.css'; } if( $a->module === 'login' ) - $a->page['end'] .= ''; + $a->page['end'] .= ''; } From cc4d091db0ac1347e381aa37a24a4f281743df4c Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sat, 1 Jun 2013 10:44:20 -0600 Subject: [PATCH 2/2] remove some now-unnecessary templates --- .../decaf-mobile/templates/login_head.tpl | 7 - view/theme/frost-mobile/js/fk.autocomplete.js | 194 ------------------ .../frost-mobile/js/fk.autocomplete.min.js | 1 - .../frost-mobile/templates/login_head.tpl | 7 - view/theme/frost/js/fk.autocomplete.js | 194 ------------------ view/theme/frost/js/fk.autocomplete.min.js | 1 - view/theme/frost/templates/field_combobox.tpl | 23 --- view/theme/frost/templates/field_input.tpl | 11 - view/theme/frost/templates/field_openid.tpl | 11 - view/theme/frost/templates/field_password.tpl | 11 - view/theme/frost/templates/login_head.tpl | 7 - .../frost/templates/posted_date_widget.tpl | 14 -- 12 files changed, 481 deletions(-) delete mode 100644 view/theme/decaf-mobile/templates/login_head.tpl delete mode 100644 view/theme/frost-mobile/js/fk.autocomplete.js delete mode 100644 view/theme/frost-mobile/js/fk.autocomplete.min.js delete mode 100644 view/theme/frost-mobile/templates/login_head.tpl delete mode 100644 view/theme/frost/js/fk.autocomplete.js delete mode 100644 view/theme/frost/js/fk.autocomplete.min.js delete mode 100644 view/theme/frost/templates/field_combobox.tpl delete mode 100644 view/theme/frost/templates/field_input.tpl delete mode 100644 view/theme/frost/templates/field_openid.tpl delete mode 100644 view/theme/frost/templates/field_password.tpl delete mode 100644 view/theme/frost/templates/login_head.tpl delete mode 100644 view/theme/frost/templates/posted_date_widget.tpl diff --git a/view/theme/decaf-mobile/templates/login_head.tpl b/view/theme/decaf-mobile/templates/login_head.tpl deleted file mode 100644 index c2d9504ad3..0000000000 --- a/view/theme/decaf-mobile/templates/login_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -{{**}} - diff --git a/view/theme/frost-mobile/js/fk.autocomplete.js b/view/theme/frost-mobile/js/fk.autocomplete.js deleted file mode 100644 index 8ca73b1288..0000000000 --- a/view/theme/frost-mobile/js/fk.autocomplete.js +++ /dev/null @@ -1,194 +0,0 @@ -/** - * Friendica people autocomplete - * - * require jQuery, jquery.textareas - */ - - - -function ACPopup(elm,backend_url){ - this.idsel=-1; - this.element = elm; - this.searchText=""; - this.ready=true; - this.kp_timer = false; - this.url = backend_url; - - var w = 530; - var h = 130; - - - if(typeof elm.editorId == "undefined") { - style = $j(elm).offset(); - w = $j(elm).width(); - h = $j(elm).height(); - } - else { - var container = elm.getContainer(); - if(typeof container != "undefined") { - style = $j(container).offset(); - w = $j(container).width(); - h = $j(container).height(); - } - } - - style.top=style.top+h; - style.width = w; - style.position = 'absolute'; - /* style['max-height'] = '150px'; - style.border = '1px solid red'; - style.background = '#cccccc'; - - style.overflow = 'auto'; - style['z-index'] = '100000'; - */ - style.display = 'none'; - - this.cont = $j("

"); - this.cont.css(style); - - $j("body").append(this.cont); -} -ACPopup.prototype.close = function(){ - $j(this.cont).remove(); - this.ready=false; -} -ACPopup.prototype.search = function(text){ - var that = this; - this.searchText=text; - if (this.kp_timer) clearTimeout(this.kp_timer); - this.kp_timer = setTimeout( function(){that._search();}, 500); -} -ACPopup.prototype._search = function(){ - console.log("_search"); - var that = this; - var postdata = { - start:0, - count:100, - search:this.searchText, - type:'c', - } - - $j.ajax({ - type:'POST', - url: this.url, - data: postdata, - dataType: 'json', - success:function(data){ - that.cont.html(""); - if (data.tot>0){ - that.cont.show(); - $j(data.items).each(function(){ - html = "{1} ({2})".format(this.photo, this.name, this.nick) - that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); - }); - } else { - that.cont.hide(); - } - } - }); - -} - ACPopup.prototype.add = function(label, value){ - var that=this; - var elm = $j("
"+label+"
"); - elm.click(function(e){ - t = $j(this).attr('title').replace(new RegExp(' \- .*'),''); - if(typeof(that.element.container) === "undefined") { - el=$j(that.element); - sel = el.getSelection(); - sel.start = sel.start- that.searchText.length; - el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false); - that.close(); - } - else { - txt = tinyMCE.activeEditor.getContent(); - // alert(that.searchText + ':' + t); - newtxt = txt.replace(that.searchText,t+' '); - tinyMCE.activeEditor.setContent(newtxt); - tinyMCE.activeEditor.focus(); - that.close(); - } - }); - $j(this.cont).append(elm); -} -ACPopup.prototype.onkey = function(event){ - if (event.keyCode == '13') { - if(this.idsel>-1) { - this.cont.children()[this.idsel].click(); - event.preventDefault(); - } - else - this.close(); - } - if (event.keyCode == '38') { //cursor up - cmax = this.cont.children().size()-1; - this.idsel--; - if (this.idsel<0) this.idsel=cmax; - event.preventDefault(); - } - if (event.keyCode == '40' || event.keyCode == '9') { //cursor down - cmax = this.cont.children().size()-1; - this.idsel++; - if (this.idsel>cmax) this.idsel=0; - event.preventDefault(); - } - - if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') { - this.cont.children().removeClass('selected'); - $j(this.cont.children()[this.idsel]).addClass('selected'); - } - - if (event.keyCode == '27') { //ESC - this.close(); - } -} - -function ContactAutocomplete(element,backend_url){ - this.pattern=/@([^ \n]+)$/; - this.popup=null; - var that = this; - - $j(element).unbind('keydown'); - $j(element).unbind('keyup'); - - $j(element).keydown(function(event){ - if (that.popup!==null) that.popup.onkey(event); - }); - - $j(element).keyup(function(event){ - cpos = $j(this).getSelection(); - if (cpos.start==cpos.end){ - match = $j(this).val().substring(0,cpos.start).match(that.pattern); - if (match!==null){ - if (that.popup===null){ - that.popup = new ACPopup(this, backend_url); - } - if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]); - if (!that.popup.ready) that.popup=null; - - } else { - if (that.popup!==null) {that.popup.close(); that.popup=null;} - } - - - } - }); - -} - - -/** - * jQuery plugin 'contact_autocomplete' - */ -(function( $ ){ - $j.fn.contact_autocomplete = function(backend_url) { - this.each(function(){ - new ContactAutocomplete(this, backend_url); - }); - }; -})( jQuery ); - - - - diff --git a/view/theme/frost-mobile/js/fk.autocomplete.min.js b/view/theme/frost-mobile/js/fk.autocomplete.min.js deleted file mode 100644 index 0bb8e19227..0000000000 --- a/view/theme/frost-mobile/js/fk.autocomplete.min.js +++ /dev/null @@ -1 +0,0 @@ -function ACPopup(elm,backend_url){this.idsel=-1;this.element=elm;this.searchText="";this.ready=true;this.kp_timer=false;this.url=backend_url;var w=530;var h=130;if(typeof elm.editorId=="undefined"){style=$j(elm).offset();w=$j(elm).width();h=$j(elm).height()}else{var container=elm.getContainer();if(typeof container!="undefined"){style=$j(container).offset();w=$j(container).width();h=$j(container).height()}}style.top=style.top+h;style.width=w;style.position="absolute";style.display="none";this.cont=$j("
");this.cont.css(style);$j("body").append(this.cont)}ACPopup.prototype.close=function(){$j(this.cont).remove();this.ready=false};ACPopup.prototype.search=function(text){var that=this;this.searchText=text;if(this.kp_timer)clearTimeout(this.kp_timer);this.kp_timer=setTimeout(function(){that._search()},500)};ACPopup.prototype._search=function(){console.log("_search");var that=this;var postdata={start:0,count:100,search:this.searchText,type:"c"};$j.ajax({type:"POST",url:this.url,data:postdata,dataType:"json",success:function(data){that.cont.html("");if(data.tot>0){that.cont.show();$j(data.items).each(function(){html="{1} ({2})".format(this.photo,this.name,this.nick);that.add(html,this.nick.replace(" ","")+"+"+this.id+" - "+this.link)})}else{that.cont.hide()}}})};ACPopup.prototype.add=function(label,value){var that=this;var elm=$j("
"+label+"
");elm.click(function(e){t=$j(this).attr("title").replace(new RegExp(" - .*"),"");if(typeof that.element.container==="undefined"){el=$j(that.element);sel=el.getSelection();sel.start=sel.start-that.searchText.length;el.setSelection(sel.start,sel.end).replaceSelectedText(t+" ").collapseSelection(false);that.close()}else{txt=tinyMCE.activeEditor.getContent();newtxt=txt.replace(that.searchText,t+" ");tinyMCE.activeEditor.setContent(newtxt);tinyMCE.activeEditor.focus();that.close()}});$j(this.cont).append(elm)};ACPopup.prototype.onkey=function(event){if(event.keyCode=="13"){if(this.idsel>-1){this.cont.children()[this.idsel].click();event.preventDefault()}else this.close()}if(event.keyCode=="38"){cmax=this.cont.children().size()-1;this.idsel--;if(this.idsel<0)this.idsel=cmax;event.preventDefault()}if(event.keyCode=="40"||event.keyCode=="9"){cmax=this.cont.children().size()-1;this.idsel++;if(this.idsel>cmax)this.idsel=0;event.preventDefault()}if(event.keyCode=="38"||event.keyCode=="40"||event.keyCode=="9"){this.cont.children().removeClass("selected");$j(this.cont.children()[this.idsel]).addClass("selected")}if(event.keyCode=="27"){this.close()}};function ContactAutocomplete(element,backend_url){this.pattern=/@([^ \n]+)$/;this.popup=null;var that=this;$j(element).unbind("keydown");$j(element).unbind("keyup");$j(element).keydown(function(event){if(that.popup!==null)that.popup.onkey(event)});$j(element).keyup(function(event){cpos=$j(this).getSelection();if(cpos.start==cpos.end){match=$j(this).val().substring(0,cpos.start).match(that.pattern);if(match!==null){if(that.popup===null){that.popup=new ACPopup(this,backend_url)}if(that.popup.ready&&match[1]!==that.popup.searchText)that.popup.search(match[1]);if(!that.popup.ready)that.popup=null}else{if(that.popup!==null){that.popup.close();that.popup=null}}}})}(function($){$j.fn.contact_autocomplete=function(backend_url){this.each(function(){new ContactAutocomplete(this,backend_url)})}})(jQuery); \ No newline at end of file diff --git a/view/theme/frost-mobile/templates/login_head.tpl b/view/theme/frost-mobile/templates/login_head.tpl deleted file mode 100644 index c2d9504ad3..0000000000 --- a/view/theme/frost-mobile/templates/login_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -{{**}} - diff --git a/view/theme/frost/js/fk.autocomplete.js b/view/theme/frost/js/fk.autocomplete.js deleted file mode 100644 index 8ca73b1288..0000000000 --- a/view/theme/frost/js/fk.autocomplete.js +++ /dev/null @@ -1,194 +0,0 @@ -/** - * Friendica people autocomplete - * - * require jQuery, jquery.textareas - */ - - - -function ACPopup(elm,backend_url){ - this.idsel=-1; - this.element = elm; - this.searchText=""; - this.ready=true; - this.kp_timer = false; - this.url = backend_url; - - var w = 530; - var h = 130; - - - if(typeof elm.editorId == "undefined") { - style = $j(elm).offset(); - w = $j(elm).width(); - h = $j(elm).height(); - } - else { - var container = elm.getContainer(); - if(typeof container != "undefined") { - style = $j(container).offset(); - w = $j(container).width(); - h = $j(container).height(); - } - } - - style.top=style.top+h; - style.width = w; - style.position = 'absolute'; - /* style['max-height'] = '150px'; - style.border = '1px solid red'; - style.background = '#cccccc'; - - style.overflow = 'auto'; - style['z-index'] = '100000'; - */ - style.display = 'none'; - - this.cont = $j("
"); - this.cont.css(style); - - $j("body").append(this.cont); -} -ACPopup.prototype.close = function(){ - $j(this.cont).remove(); - this.ready=false; -} -ACPopup.prototype.search = function(text){ - var that = this; - this.searchText=text; - if (this.kp_timer) clearTimeout(this.kp_timer); - this.kp_timer = setTimeout( function(){that._search();}, 500); -} -ACPopup.prototype._search = function(){ - console.log("_search"); - var that = this; - var postdata = { - start:0, - count:100, - search:this.searchText, - type:'c', - } - - $j.ajax({ - type:'POST', - url: this.url, - data: postdata, - dataType: 'json', - success:function(data){ - that.cont.html(""); - if (data.tot>0){ - that.cont.show(); - $j(data.items).each(function(){ - html = "{1} ({2})".format(this.photo, this.name, this.nick) - that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); - }); - } else { - that.cont.hide(); - } - } - }); - -} - ACPopup.prototype.add = function(label, value){ - var that=this; - var elm = $j("
"+label+"
"); - elm.click(function(e){ - t = $j(this).attr('title').replace(new RegExp(' \- .*'),''); - if(typeof(that.element.container) === "undefined") { - el=$j(that.element); - sel = el.getSelection(); - sel.start = sel.start- that.searchText.length; - el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false); - that.close(); - } - else { - txt = tinyMCE.activeEditor.getContent(); - // alert(that.searchText + ':' + t); - newtxt = txt.replace(that.searchText,t+' '); - tinyMCE.activeEditor.setContent(newtxt); - tinyMCE.activeEditor.focus(); - that.close(); - } - }); - $j(this.cont).append(elm); -} -ACPopup.prototype.onkey = function(event){ - if (event.keyCode == '13') { - if(this.idsel>-1) { - this.cont.children()[this.idsel].click(); - event.preventDefault(); - } - else - this.close(); - } - if (event.keyCode == '38') { //cursor up - cmax = this.cont.children().size()-1; - this.idsel--; - if (this.idsel<0) this.idsel=cmax; - event.preventDefault(); - } - if (event.keyCode == '40' || event.keyCode == '9') { //cursor down - cmax = this.cont.children().size()-1; - this.idsel++; - if (this.idsel>cmax) this.idsel=0; - event.preventDefault(); - } - - if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') { - this.cont.children().removeClass('selected'); - $j(this.cont.children()[this.idsel]).addClass('selected'); - } - - if (event.keyCode == '27') { //ESC - this.close(); - } -} - -function ContactAutocomplete(element,backend_url){ - this.pattern=/@([^ \n]+)$/; - this.popup=null; - var that = this; - - $j(element).unbind('keydown'); - $j(element).unbind('keyup'); - - $j(element).keydown(function(event){ - if (that.popup!==null) that.popup.onkey(event); - }); - - $j(element).keyup(function(event){ - cpos = $j(this).getSelection(); - if (cpos.start==cpos.end){ - match = $j(this).val().substring(0,cpos.start).match(that.pattern); - if (match!==null){ - if (that.popup===null){ - that.popup = new ACPopup(this, backend_url); - } - if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]); - if (!that.popup.ready) that.popup=null; - - } else { - if (that.popup!==null) {that.popup.close(); that.popup=null;} - } - - - } - }); - -} - - -/** - * jQuery plugin 'contact_autocomplete' - */ -(function( $ ){ - $j.fn.contact_autocomplete = function(backend_url) { - this.each(function(){ - new ContactAutocomplete(this, backend_url); - }); - }; -})( jQuery ); - - - - diff --git a/view/theme/frost/js/fk.autocomplete.min.js b/view/theme/frost/js/fk.autocomplete.min.js deleted file mode 100644 index 0bb8e19227..0000000000 --- a/view/theme/frost/js/fk.autocomplete.min.js +++ /dev/null @@ -1 +0,0 @@ -function ACPopup(elm,backend_url){this.idsel=-1;this.element=elm;this.searchText="";this.ready=true;this.kp_timer=false;this.url=backend_url;var w=530;var h=130;if(typeof elm.editorId=="undefined"){style=$j(elm).offset();w=$j(elm).width();h=$j(elm).height()}else{var container=elm.getContainer();if(typeof container!="undefined"){style=$j(container).offset();w=$j(container).width();h=$j(container).height()}}style.top=style.top+h;style.width=w;style.position="absolute";style.display="none";this.cont=$j("
");this.cont.css(style);$j("body").append(this.cont)}ACPopup.prototype.close=function(){$j(this.cont).remove();this.ready=false};ACPopup.prototype.search=function(text){var that=this;this.searchText=text;if(this.kp_timer)clearTimeout(this.kp_timer);this.kp_timer=setTimeout(function(){that._search()},500)};ACPopup.prototype._search=function(){console.log("_search");var that=this;var postdata={start:0,count:100,search:this.searchText,type:"c"};$j.ajax({type:"POST",url:this.url,data:postdata,dataType:"json",success:function(data){that.cont.html("");if(data.tot>0){that.cont.show();$j(data.items).each(function(){html="{1} ({2})".format(this.photo,this.name,this.nick);that.add(html,this.nick.replace(" ","")+"+"+this.id+" - "+this.link)})}else{that.cont.hide()}}})};ACPopup.prototype.add=function(label,value){var that=this;var elm=$j("
"+label+"
");elm.click(function(e){t=$j(this).attr("title").replace(new RegExp(" - .*"),"");if(typeof that.element.container==="undefined"){el=$j(that.element);sel=el.getSelection();sel.start=sel.start-that.searchText.length;el.setSelection(sel.start,sel.end).replaceSelectedText(t+" ").collapseSelection(false);that.close()}else{txt=tinyMCE.activeEditor.getContent();newtxt=txt.replace(that.searchText,t+" ");tinyMCE.activeEditor.setContent(newtxt);tinyMCE.activeEditor.focus();that.close()}});$j(this.cont).append(elm)};ACPopup.prototype.onkey=function(event){if(event.keyCode=="13"){if(this.idsel>-1){this.cont.children()[this.idsel].click();event.preventDefault()}else this.close()}if(event.keyCode=="38"){cmax=this.cont.children().size()-1;this.idsel--;if(this.idsel<0)this.idsel=cmax;event.preventDefault()}if(event.keyCode=="40"||event.keyCode=="9"){cmax=this.cont.children().size()-1;this.idsel++;if(this.idsel>cmax)this.idsel=0;event.preventDefault()}if(event.keyCode=="38"||event.keyCode=="40"||event.keyCode=="9"){this.cont.children().removeClass("selected");$j(this.cont.children()[this.idsel]).addClass("selected")}if(event.keyCode=="27"){this.close()}};function ContactAutocomplete(element,backend_url){this.pattern=/@([^ \n]+)$/;this.popup=null;var that=this;$j(element).unbind("keydown");$j(element).unbind("keyup");$j(element).keydown(function(event){if(that.popup!==null)that.popup.onkey(event)});$j(element).keyup(function(event){cpos=$j(this).getSelection();if(cpos.start==cpos.end){match=$j(this).val().substring(0,cpos.start).match(that.pattern);if(match!==null){if(that.popup===null){that.popup=new ACPopup(this,backend_url)}if(that.popup.ready&&match[1]!==that.popup.searchText)that.popup.search(match[1]);if(!that.popup.ready)that.popup=null}else{if(that.popup!==null){that.popup.close();that.popup=null}}}})}(function($){$j.fn.contact_autocomplete=function(backend_url){this.each(function(){new ContactAutocomplete(this,backend_url)})}})(jQuery); \ No newline at end of file diff --git a/view/theme/frost/templates/field_combobox.tpl b/view/theme/frost/templates/field_combobox.tpl deleted file mode 100644 index 8f0e17619f..0000000000 --- a/view/theme/frost/templates/field_combobox.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - -
- - {{* html5 don't work on Chrome, Safari and IE9 - - - {{foreach $field.4 as $opt=>$val}} *}} - - - - - {{$field.3}} -
- diff --git a/view/theme/frost/templates/field_input.tpl b/view/theme/frost/templates/field_input.tpl deleted file mode 100644 index 0847961887..0000000000 --- a/view/theme/frost/templates/field_input.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - -
- - - {{$field.3}} -
diff --git a/view/theme/frost/templates/field_openid.tpl b/view/theme/frost/templates/field_openid.tpl deleted file mode 100644 index ed94fad7a5..0000000000 --- a/view/theme/frost/templates/field_openid.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - -
- - - {{$field.3}} -
diff --git a/view/theme/frost/templates/field_password.tpl b/view/theme/frost/templates/field_password.tpl deleted file mode 100644 index c88d3ef58a..0000000000 --- a/view/theme/frost/templates/field_password.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} - -
- - - {{$field.3}} -
diff --git a/view/theme/frost/templates/login_head.tpl b/view/theme/frost/templates/login_head.tpl deleted file mode 100644 index 5cac7bd1d7..0000000000 --- a/view/theme/frost/templates/login_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -{{**}} - diff --git a/view/theme/frost/templates/posted_date_widget.tpl b/view/theme/frost/templates/posted_date_widget.tpl deleted file mode 100644 index 6482f66559..0000000000 --- a/view/theme/frost/templates/posted_date_widget.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
-

{{$title}}

- - -