[fusion-commits] r1542 - branches/fusion-1.1/jx/lib
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Mon Sep 22 15:57:16 EDT 2008
Author: madair
Date: 2008-09-22 15:57:16 -0400 (Mon, 22 Sep 2008)
New Revision: 1542
Modified:
branches/fusion-1.1/jx/lib/jx_combined.js
branches/fusion-1.1/jx/lib/jx_compressed.js
Log:
re #109: reverting changes in Jx
Modified: branches/fusion-1.1/jx/lib/jx_combined.js
===================================================================
--- branches/fusion-1.1/jx/lib/jx_combined.js 2008-09-22 18:48:25 UTC (rev 1541)
+++ branches/fusion-1.1/jx/lib/jx_combined.js 2008-09-22 19:57:16 UTC (rev 1542)
@@ -5797,7 +5797,7 @@
this.event = null;
}
}/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxcore.js 527 2008-07-02 18:04:01Z pspencer $
*
* Title: Jx Core
*
@@ -6773,7 +6773,7 @@
Object.extend({method:'get',
onSuccess:this.contentLoaded.bind(this, element, options),
onFailure: this.contentLoadFailed.bind(this, options),
- //requestHeaders: ['If-Modified-Since', 'Sat, 1 Jan 2000 00:00:00 GMT'],
+ requestHeaders: ['If-Modified-Since', 'Sat, 1 Jan 2000 00:00:00 GMT'],
parameters: ts}));
} else if (options.contentHTML) {
element.innerHTML = options.contentHTML;
@@ -6786,7 +6786,7 @@
}
}
};/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxbutton.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Button
*
@@ -7357,7 +7357,7 @@
}
});/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxcolor.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Color
*
@@ -7982,7 +7982,7 @@
}
});
/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxdialog.js 524 2008-05-07 19:49:03Z madair $
*
* Title: Jx.Dialog
*
@@ -8842,7 +8842,7 @@
};
Object.extend(Jx.Dialog.prototype, Jx.UniqueId.prototype);
Object.extend(Jx.Dialog.prototype, Jx.ContentLoader.prototype);/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxgrid.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Grid
*
@@ -9772,7 +9772,7 @@
return {row:row,column:col};
}
};/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxlayout.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Layout
*
@@ -10239,7 +10239,7 @@
}
}
};/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxmenu.js 508 2008-02-28 20:57:12Z pspencer $
*
* Title: Jx.Menu
*
@@ -10960,7 +10960,7 @@
Jx.Menu.prototype.show.apply(this, [e]);
}
});/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxpanel.js 504 2008-02-21 01:18:50Z pspencer $
*
* Title: Jx.Panel
*
@@ -11399,7 +11399,7 @@
};
Object.extend(Jx.Panel.prototype, Jx.UniqueId.prototype);
Object.extend(Jx.Panel.prototype, Jx.ContentLoader.prototype);/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxpicker.js 515 2008-03-10 23:19:15Z pspencer $
*
* Title: Jx.Picker
*
@@ -11737,7 +11737,7 @@
}
};
Object.extend(Jx.Picker.prototype, Jx.Listener.prototype);/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxsplitter.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Splitter
*
@@ -12488,7 +12488,7 @@
}
}
};/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxtab.js 526 2008-06-24 12:56:56Z pspencer $
*
* Title: Jx.Tab
*
@@ -12888,7 +12888,7 @@
};
Object.extend(Jx.TabBox.prototype, Jx.Listener.prototype);
/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxtoolbar.js 503 2008-02-18 22:54:09Z pspencer $
*
* Title: Jx.Toolbar
*
@@ -13173,7 +13173,7 @@
};
/**
- * $Id: jx_combined.js 776 2008-08-22 18:46:25Z madair $
+ * $Id: jxtree.js 505 2008-02-21 02:32:39Z pspencer $
*
* Title: Jx.Tree
*
Modified: branches/fusion-1.1/jx/lib/jx_compressed.js
===================================================================
--- branches/fusion-1.1/jx/lib/jx_compressed.js 2008-09-22 18:48:25 UTC (rev 1541)
+++ branches/fusion-1.1/jx/lib/jx_compressed.js 2008-09-22 19:57:16 UTC (rev 1542)
@@ -417,7 +417,7 @@
elem.style.height=height+'px';}}else{if(typeof size.width!='undefined'&&size.width>=0){elem.style.width=size.width+'px';}
if(typeof size.height!='undefined'&&size.height>=0){elem.style.height=size.height+'px';}}},getPaddingSize:function(elem){elem=$(elem);Element.toggleMeasurable(elem);var l=Element.getNumber(Element.getStyle(elem,'padding-left'));var t=Element.getNumber(Element.getStyle(elem,'padding-top'));var r=Element.getNumber(Element.getStyle(elem,'padding-right'));var b=Element.getNumber(Element.getStyle(elem,'padding-bottom'));Element.toggleMeasurable(elem);return{left:l,top:t,right:r,bottom:b};},getBorderSize:function(elem){elem=$(elem);Element.toggleMeasurable(elem);var l=Element.getNumber(Element.getStyle(elem,'border-left-width'));var t=Element.getNumber(Element.getStyle(elem,'border-top-width'));var r=Element.getNumber(Element.getStyle(elem,'border-right-width'));var b=Element.getNumber(Element.getStyle(elem,'border-bottom-width'));Element.toggleMeasurable(elem);return{left:l,top:t,right:r,bottom:b};},getMarginSize:function(elem){elem=$(elem);Element.toggleMeasurable(elem);var l=Element.getNumber(Element.getStyle(elem,'margin-left'));var t=Element.getNumber(Element.getStyle(elem,'margin-top'));var r=Element.getNumber(Element.getStyle(elem,'margin-right'));var b=Element.getNumber(Element.getStyle(elem,'margin-bottom'));Element.toggleMeasurable(elem);return{left:l,top:t,right:r,bottom:b};},getNumber:function(n){var result=n==null||isNaN(parseInt(n))?0:parseInt(n);return result;},getPageDimensions:function(){return{width:Element.getInsideWindowWidth(),height:Element.getInsideWindowHeight()};},getInsideWindowWidth:function(){if(window.innerWidth){return window.innerWidth;}else if(document.compatMode&&document.compatMode.indexOf("CSS1")>=0){return document.body.parentElement.clientWidth;}else if(document.body&&document.body.clientWidth){return document.body.clientWidth;}
return 0;},getInsideWindowHeight:function(){if(window.innerHeight){return window.innerHeight;}else if(document.compatMode&&document.compatMode.indexOf("CSS1")>=0){return document.body.parentElement.clientHeight;}else if(document.body&&document.body.clientHeight){return document.body.clientHeight;}
-return 0;},toggleMeasurable:function(elem){if(Element.getStyle(elem,'display')=='none'){elem.old={};elem.old.display=elem.style.display;elem.old.visibility=elem.style.visibility;elem.old.position=elem.style.position;elem.style.position='absolute';elem.style.visibility='hidden';elem.style.display='block';}else{if(elem.old){elem.style.display=elem.old.display;elem.style.visibility=elem.old.visibility;elem.style.position=elem.old.position;elem.old=null;}}}});Jx.ContentLoader=Class.create();Jx.ContentLoader.prototype={bContentLoaded:false,contentLoaded:function(element,options,r){element.innerHTML=r.responseText;this.bContentLoaded=true;if(options.onContentLoaded){options.onContentLoaded();}},contentLoadFailed:function(options,r){this.bContentLoaded=false;if(options.onContentLoadFailed){options.onContentLoadFailed();}},loadContent:function(element,options){options=options||{};element=$(element);if(options.content){element.appendChild(options.content);this.bContentLoaded=true;}else if(options.contentID){var c=$(options.contentID);if(c){element.appendChild(c);this.bContentLoaded=true;}}else if(options.contentURL){this.bContentLoaded=false;var ts='';var a=new Ajax.Request(options.contentURL,Object.extend({method:'get',onSuccess:this.contentLoaded.bind(this,element,options),onFailure:this.contentLoadFailed.bind(this,options),parameters:ts}));}else if(options.contentHTML){element.innerHTML=options.contentHTML;this.bContentLoaded=true;}else{this.bContentLoaded=true;}
+return 0;},toggleMeasurable:function(elem){if(Element.getStyle(elem,'display')=='none'){elem.old={};elem.old.display=elem.style.display;elem.old.visibility=elem.style.visibility;elem.old.position=elem.style.position;elem.style.position='absolute';elem.style.visibility='hidden';elem.style.display='block';}else{if(elem.old){elem.style.display=elem.old.display;elem.style.visibility=elem.old.visibility;elem.style.position=elem.old.position;elem.old=null;}}}});Jx.ContentLoader=Class.create();Jx.ContentLoader.prototype={bContentLoaded:false,contentLoaded:function(element,options,r){element.innerHTML=r.responseText;this.bContentLoaded=true;if(options.onContentLoaded){options.onContentLoaded();}},contentLoadFailed:function(options,r){this.bContentLoaded=false;if(options.onContentLoadFailed){options.onContentLoadFailed();}},loadContent:function(element,options){options=options||{};element=$(element);if(options.content){element.appendChild(options.content);this.bContentLoaded=true;}else if(options.contentID){var c=$(options.contentID);if(c){element.appendChild(c);this.bContentLoaded=true;}}else if(options.contentURL){this.bContentLoaded=false;var ts='';var a=new Ajax.Request(options.contentURL,Object.extend({method:'get',onSuccess:this.contentLoaded.bind(this,element,options),onFailure:this.contentLoadFailed.bind(this,options),requestHeaders:['If-Modified-Since','Sat, 1 Jan 2000 00:00:00 GMT'],parameters:ts}));}else if(options.contentHTML){element.innerHTML=options.contentHTML;this.bContentLoaded=true;}else{this.bContentLoaded=true;}
if(this.bContentLoaded&&options.onContentLoaded){options.onContentLoaded();}}};Jx.addStyleSheet('button/button.css');Jx.Button=Class.create();Object.extend(Jx.Button.prototype,Jx.Listener.prototype);Object.extend(Jx.Button.prototype,{al:null,domObj:null,enabled:null,initialize:function(action,options){options=options||{};this.al=[];this.action=action;var imgPath=(options.imgPath||options.image)||'';var tooltip=options.tooltip||'';var label=options.label||'';this.disabledClass=options.disabledClass||'jxDisabled';this.domA=document.createElement('a');this.domA.className='jxButton';this.domA.href='javascript:void(0)';this.domA.onclick=this.onclick.bindAsEventListener(this);this.domA.title=tooltip;this.domA.alt=tooltip;var span=document.createElement('span');span.className='jxButtonSpan';this.domA.appendChild(span);this.domLabel=document.createElement('span');this.domLabel.className='jxButtonContent';this.domLabel.innerHTML=label!=''?label:' ';span.appendChild(this.domLabel);if(label!=''){Element.addClassName(this.domLabel,'jxButtonLabel');}
if(imgPath!=''){Element.addClassName(this.domLabel,'jxButtonIcon');this.domLabel.style.backgroundImage="url("+imgPath+")";}
if(this.action){this.action.bindTo(this);this.propertyChanged(this.action);}
More information about the fusion-commits
mailing list