From: Thyamad c. <th...@us...> - 2006-01-29 23:11:33
|
Update of /cvsroot/thyapi/thyapi/thywidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28909/thywidgets Modified Files: thydialogwindow.js thywindow.js thywindow_ie.js Log Message: Commiting file additions and modification from SVN revision 2736 to 2737... Changes made by frank on 2006-01-30 01:18:38 +0100 (Mon, 30 Jan 2006) corresponding to SVN revision 2737 with message: vinicius corrections Index: thywindow.js =================================================================== RCS file: /cvsroot/thyapi/thyapi/thywidgets/thywindow.js,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** thywindow.js 26 Jan 2006 17:58:32 -0000 1.9 --- thywindow.js 29 Jan 2006 23:11:23 -0000 1.10 *************** *** 19,23 **** * Class: thyWindow * ! * This class implements the infamous Window widget. As it is derivate * from thyBorderPanel, it has borders and all the CSS classes that widget * has. --- 19,23 ---- * Class: thyWindow * ! * This class implements the infamous Window widget. As it is derivate * from thyBorderPanel, it has borders and all the CSS classes that widget * has. *************** *** 44,49 **** function thyWindow(name,title,html) { ! this.thyBorderPanel = thyPanel; ! // this.thyBorderPanel = thyBorderPanel; this.thyBorderPanel(name); --- 44,48 ---- function thyWindow(name,title,html) { ! this.thyBorderPanel = thyBorderPanel; this.thyBorderPanel(name); *************** *** 63,70 **** this.content.cssExtraClasses = this.cssExtraClasses; this.titleLayer.cssExtraClasses = this.cssExtraClasses; ! // Turn Window into Draggable element this.winDragBorder.setAnchor({ ! topA: this.id, leftA: this.id }); --- 62,69 ---- this.content.cssExtraClasses = this.cssExtraClasses; this.titleLayer.cssExtraClasses = this.cssExtraClasses; ! // Turn Window into Draggable element this.winDragBorder.setAnchor({ ! topA: this.id, leftA: this.id }); *************** *** 91,94 **** --- 90,95 ---- // Initialize Content this.content.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; + this.btnStick.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; + this.btnClose.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; this._thyBorderPanelAddChild(this.titleLayer); *************** *** 132,136 **** if (data['title']) this.setTitle(data['title']); } ! /** * Method: setTitle --- 133,137 ---- if (data['title']) this.setTitle(data['title']); } ! /** * Method: setTitle *************** *** 142,155 **** { this.titleLayer.setHTML(''); ! this.setSize('',''); this.setDisplay(true); ! var w = this.titleLayer.getWidth(); ! this.titleLayer.setHTML(title); var length = title.length; ! if (w >= this.titleLayer.getWidth()) { --- 143,156 ---- { this.titleLayer.setHTML(''); ! this.setSize('',''); this.setDisplay(true); ! var w = this.titleLayer.getWidth(); ! this.titleLayer.setHTML(title); var length = title.length; ! if (w >= this.titleLayer.getWidth()) { *************** *** 163,170 **** this.titleLayer.setHTML(dynapi.functions.limitString(title,length)); } ! this.titleLayer.setHTML(dynapi.functions.limitString(title,length-3)); } ! if (!this.openned) { --- 164,171 ---- this.titleLayer.setHTML(dynapi.functions.limitString(title,length)); } ! this.titleLayer.setHTML(dynapi.functions.limitString(title,length-3)); } ! if (!this.openned) { *************** *** 205,209 **** }; ! if (!this._created) { this.onCreate(position); --- 206,210 ---- }; ! if (!this._created) { this.onCreate(position); *************** *** 213,217 **** position(); } ! this.setZIndex({topmost: true}); this.titleLayer.setZIndex({above: this}); --- 214,218 ---- position(); } ! this.setZIndex({topmost: true}); this.titleLayer.setZIndex({above: this}); *************** *** 238,242 **** this.invokeEvent('close', new DynEvent('close',this)); } ! p._thyBordePanelSetName = p.setName; /** --- 239,243 ---- this.invokeEvent('close', new DynEvent('close',this)); } ! p._thyBordePanelSetName = p.setName; /** *************** *** 254,258 **** { if (name == null || this.name == name) return; ! this._thyBorderPanelSetName(name); if (this.titleLayer) this.titleLayer.setName(name+'_title'); --- 255,259 ---- { if (name == null || this.name == name) return; ! this._thyBorderPanelSetName(name); if (this.titleLayer) this.titleLayer.setName(name+'_title'); *************** *** 284,288 **** if (this.winDragBorder) this.winDragBorder.setCSSClass(type); } ! p._thyBorderPanelAddChild = p.addChild; /** --- 285,289 ---- if (this.winDragBorder) this.winDragBorder.setCSSClass(type); } ! p._thyBorderPanelAddChild = p.addChild; /** *************** *** 308,312 **** this.content.removeChild(c); } ! /** * Method: getInnerHTML --- 309,313 ---- this.content.removeChild(c); } ! /** * Method: getInnerHTML *************** *** 375,379 **** else this.stick(); } ! /*************************************************************************\ * Private Methods * --- 376,380 ---- else this.stick(); } ! /*************************************************************************\ * Private Methods * *************** *** 398,402 **** var positions_x = thyWindow._positions_x; var positions_y = thyWindow._positions_y; ! var w = dynapi.document.getWidth(); var h = dynapi.document.getHeight(); --- 399,403 ---- var positions_x = thyWindow._positions_x; var positions_y = thyWindow._positions_y; ! var w = dynapi.document.getWidth(); var h = dynapi.document.getHeight(); *************** *** 412,416 **** var i; ! for (i in positions_x) { --- 413,417 ---- var i; ! for (i in positions_x) { *************** *** 434,438 **** positions_y[thyWin.name] = new Object(); } ! positions_x[thyWin.name][x] = x; positions_y[thyWin.name][y] = y; --- 435,439 ---- positions_y[thyWin.name] = new Object(); } ! positions_x[thyWin.name][x] = x; positions_y[thyWin.name][y] = y; *************** *** 459,463 **** delete positions_x[thyWin.name]; } ! if (positions_y[thyWin.name]) { --- 460,464 ---- delete positions_x[thyWin.name]; } ! if (positions_y[thyWin.name]) { *************** *** 478,482 **** this._thyBorderPanel_destroy(); } ! p._thyBorderPanel_addCSSClass = p._addCSSClass; /** --- 479,483 ---- this._thyBorderPanel_destroy(); } ! p._thyBorderPanel_addCSSClass = p._addCSSClass; /** *************** *** 494,498 **** { this._thyBorderPanel_addCSSClass(cssClass); ! if (this.titleLayer) { this.titleLayer._addCSSClass(cssClass+'_title'); --- 495,499 ---- { this._thyBorderPanel_addCSSClass(cssClass); ! if (this.titleLayer) { this.titleLayer._addCSSClass(cssClass+'_title'); *************** *** 503,507 **** } } ! p._thyBorderPanel_removeCSSClass = p._removeCSSClass; /** --- 504,508 ---- } } ! p._thyBorderPanel_removeCSSClass = p._removeCSSClass; /** *************** *** 519,523 **** { this._thyBorderPanel_removeCSSClass(cssClass); ! if (this.titleLayer) { this.titleLayer._removeCSSClass(cssClass+'_title'); --- 520,524 ---- { this._thyBorderPanel_removeCSSClass(cssClass); ! if (this.titleLayer) { this.titleLayer._removeCSSClass(cssClass+'_title'); Index: thydialogwindow.js =================================================================== RCS file: /cvsroot/thyapi/thyapi/thywidgets/thydialogwindow.js,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** thydialogwindow.js 10 Sep 2005 18:09:03 -0000 1.6 --- thydialogwindow.js 29 Jan 2006 23:11:23 -0000 1.7 *************** *** 41,46 **** --- 41,49 ---- this.buttons = []; this.buttonLayer = new thyPanel(this.name+'_buttons'); + this.buttonLayer.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; + this.addCSSClass('thyDialogWindow'); + /*this.addChild(this.buttonLayer); */ this._thyBorderPanelAddChild(this.buttonLayer); Index: thywindow_ie.js =================================================================== RCS file: /cvsroot/thyapi/thyapi/thywidgets/thywindow_ie.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** thywindow_ie.js 27 Jan 2006 10:29:36 -0000 1.1 --- thywindow_ie.js 29 Jan 2006 23:11:23 -0000 1.2 *************** *** 100,103 **** --- 100,105 ---- // Initialize Content this.content.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; + this.btnStick.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; + this.btnClose.invokeEvent = function (type,e,args){dynapi.document.invokeEvent(type,e,args);}; this._thyBorderPanelAddChild(this.titleLayer); |