diff --git a/src/aria/widgets/AriaSkinBeans.js b/src/aria/widgets/AriaSkinBeans.js index 19d9d0af8..523d0c60d 100644 --- a/src/aria/widgets/AriaSkinBeans.js +++ b/src/aria/widgets/AriaSkinBeans.js @@ -237,12 +237,6 @@ Aria.beanDefinitions({ $type : "TableFrameStateCfg" }, { $type : "SimpleHTMLFrameStateCfg" - }, { - $type : "Old0FrameStateCfg" - }, { - $type : "Old1FrameStateCfg" - }, { - $type : "Old2FrameStateCfg" }] } }, @@ -279,12 +273,6 @@ Aria.beanDefinitions({ $type : "TableFrameCfg" }, { $type : "SimpleHTMLFrameCfg" - }, { - $type : "Old0FrameCfg" - }, { - $type : "Old1FrameCfg" - }, { - $type : "Old2FrameCfg" }] }, "ButtonCfg" : { @@ -1479,108 +1467,6 @@ Aria.beanDefinitions({ } } }, - "OldFrame" : { - $type : "Object", - $description : "", - $properties : { - spriteURL : { - $type : "json:String", - $description : "" - }, - spcLeft : { - $type : "Pixels" - }, - spcRight : { - $type : "Pixels" - }, - spcTop : { - $type : "Pixels" - }, - spcBottom : { - $type : "Pixels" - }, - sprWidth : { - $type : "Pixels" - }, - sprHeight : { - $type : "Pixels" - }, - offsetLeft : { - $type : "Pixels" - } - } - }, - "Old0FrameCfg" : { - $type : "OldFrame", - $description : "Deprecated, please use farmes of types \"FixedHeight\", \"Simple\", \"Table\", \"SimpleHTML\" instead. Frame properties have to be specified state-wise.", - $properties : { - "sprType" : { - $type : "json:Integer", - $description : "Deprecated, please use frameType instead. The value corresponding to this type of frame is 0." - }, - "frameType" : { - $type : "json:Enum", - $enumValues : ["Old0"], - $description : "The value that indicates that no frame is desired is \"Old0\"." - } - } - }, - "Old1FrameCfg" : { - $type : "OldFrame", - $description : "Deprecated, please use farmes of types \"FixedHeight\", \"Simple\", \"Table\", \"SimpleHTML\" instead. Frame properties have to be specified state-wise.", - $properties : { - "sprType" : { - $type : "json:Integer", - $description : "Deprecated, please use frameType instead. The value corresponding to this type of frame is 1." - }, - "frameType" : { - $type : "json:Enum", - $enumValues : ["Old1"], - $description : "The value that indicates that no frame is desired is \"Old1\"." - } - } - }, - "Old2FrameCfg" : { - $type : "OldFrame", - $description : "Deprecated, please use farmes of types \"FixedHeight\", \"Simple\", \"Table\", \"SimpleHTML\" instead. Frame properties have to be specified state-wise.", - $properties : { - "sprType" : { - $type : "json:Integer", - $description : "Deprecated, please use frameType instead. The value corresponding to this type of frame is 2." - }, - "frameType" : { - $type : "json:Enum", - $enumValues : ["Old2"], - $description : "The value that indicates that no frame is desired is \"Old2\"." - } - } - }, - "OldFrameState" : { - $type : "Object", - $description : "Deprecated properties of a frames of old types for this state.", - $properties : { - "sprIdx" : { - $type : "json:Integer", - $description : "" - }, - "textAlign" : { - $type : "json:String", - $description : "" - }, - "color" : { - $type : "Color" - } - } - }, - "Old0FrameStateCfg" : { - $type : "OldFrameState" - }, - "Old1FrameStateCfg" : { - $type : "OldFrameState" - }, - "Old2FrameStateCfg" : { - $type : "OldFrameState" - }, "SimpleHTMLFrameCfg" : { $type : "Object", $description : "Used for widgets which have no frame at all. No frame properties have to be specified state-wise.", diff --git a/src/aria/widgets/AriaSkinNormalization.js b/src/aria/widgets/AriaSkinNormalization.js index b030036ac..95ec534b6 100644 --- a/src/aria/widgets/AriaSkinNormalization.js +++ b/src/aria/widgets/AriaSkinNormalization.js @@ -61,9 +61,7 @@ Aria.classDefinition({ FRAME_NORMALIZATION_ERROR : "Error while normalizing the frame part of widget %1, skin class %2:\n %3", FRAME_STATE_NORMALIZATION_ERROR : "Error while normalizing the frame part of widget %1, skin class %2, state %3:\n %4", WIDGET_NORMALIZATION_ERROR : "Error while normalizing widget %1:\n %2", - GENERAL_NORMALIZATION_ERROR : "Error while normalizing general skin properties:\n %1", - - DEPRECATED_FRAME_TYPE : "The frame type %1, used in widget %2, skin class %3, is deprecated. Please use either Table, FixedHeight, SimpleHTML or Simple." + GENERAL_NORMALIZATION_ERROR : "Error while normalizing general skin properties:\n %1" }, $prototype : { /** @@ -71,10 +69,10 @@ Aria.classDefinition({ * corresponding string. * @type Array */ - _frameTypes : [ - /* 0 */"Old0", - /* 1 */"Old1", - /* 2 */"Old2", + _frameTypes : [ // 0,1,2 corresponded to old frames which were removed as of AT 1.4.1 + /* 0 */"", + /* 1 */"", + /* 2 */"", /* 3 */"Table", /* 4 */"FixedHeight", /* 5 */"SimpleHTML", @@ -155,9 +153,6 @@ Aria.classDefinition({ skinFrame.frameType = frameType; frameNormalizers.normFrameSkinClass(skin, std); if (Aria.debug) { - if (/^Old/.test(frameType)) { - this.$logWarn(this.DEPRECATED_FRAME_TYPE, [frameType, widgetName, skinClassName]); - } var res = this._check(skinFrame, 'aria.widgets.AriaSkinBeans.' + frameType + 'FrameCfg'); if (!res.result) { this.$logWarn(this.FRAME_NORMALIZATION_ERROR, [widgetName, skinClassName, diff --git a/src/aria/widgets/action/Button.js b/src/aria/widgets/action/Button.js index 82a5d8a57..18af661d9 100644 --- a/src/aria/widgets/action/Button.js +++ b/src/aria/widgets/action/Button.js @@ -95,7 +95,6 @@ Aria.classDefinition({ state : this._state, sclass : cfg.sclass, skinnableClass : this._skinnableClass, - "oldStuff:cssRoot" : "BTN", // added in PTR 05170822 to avoid the internal scrollbard for content scrollBarX : false, scrollBarY : false @@ -359,4 +358,4 @@ Aria.classDefinition({ return true; } } -}); \ No newline at end of file +}); diff --git a/src/aria/widgets/container/Div.js b/src/aria/widgets/container/Div.js index fb8ee0d6f..c38ad2f2f 100644 --- a/src/aria/widgets/container/Div.js +++ b/src/aria/widgets/container/Div.js @@ -40,7 +40,6 @@ Aria.classDefinition({ height : cfg.height, printOptions : cfg.printOptions, cssClass : cfg.cssClass, - "oldStuff:cssRoot" : "DIV", block : cfg.block, scrollBarX : cfg.scrollBarX, scrollBarY : cfg.scrollBarY diff --git a/src/aria/widgets/form/InputWithFrame.js b/src/aria/widgets/form/InputWithFrame.js index 817a7f4b4..9aebc44a3 100644 --- a/src/aria/widgets/form/InputWithFrame.js +++ b/src/aria/widgets/form/InputWithFrame.js @@ -72,7 +72,6 @@ Aria.classDefinition({ skinnableClass : this._skinnableClass, width : this._inputMarkupWidth, state : this._state, - "oldStuff:cssRoot" : "TIN", scrollBarX : false, scrollBarY : false, tooltipLabels : [cfg.iconTooltip], @@ -126,4 +125,4 @@ Aria.classDefinition({ this._frame.changeState(this._state); } } -}); \ No newline at end of file +}); diff --git a/src/aria/widgets/frames/FrameFactory.js b/src/aria/widgets/frames/FrameFactory.js index c94a02b15..31fca3c36 100644 --- a/src/aria/widgets/frames/FrameFactory.js +++ b/src/aria/widgets/frames/FrameFactory.js @@ -20,15 +20,12 @@ Aria.classDefinition({ $classpath : 'aria.widgets.frames.FrameFactory', $singleton : true, - $dependencies : ["aria.widgets.AriaSkinInterface", "aria.widgets.frames.CfgBeans", "aria.widgets.frames.OldFrame", + $dependencies : ["aria.widgets.AriaSkinInterface", "aria.widgets.frames.CfgBeans", "aria.widgets.frames.SimpleFrame", "aria.widgets.frames.TableFrame", "aria.widgets.frames.FixedHeightFrame", "aria.widgets.frames.SimpleHTMLFrame"], $constructor : function () { /* The keys in the following map are associated with the STATIC sprite types */ this._frameTypeBuilders = { - "Old0" : aria.widgets.frames.OldFrame, - "Old1" : aria.widgets.frames.OldFrame, - "Old2" : aria.widgets.frames.OldFrame, "Table" : aria.widgets.frames.TableFrame, "FixedHeight" : aria.widgets.frames.FixedHeightFrame, "SimpleHTML" : aria.widgets.frames.SimpleHTMLFrame, @@ -79,8 +76,8 @@ Aria.classDefinition({ }, /** - * Create a new frame according to the given configuration object. The type of frame returned (either OldFrame, - * TableFrame or FixedHeightFrame) depends on the frame.frameType property of the skin class. + * Create a new frame according to the given configuration object. The type of frame returned (either TableFrame + * or FixedHeightFrame) depends on the frame.frameType property of the skin class. * @param {aria.widgets.frames.CfgBeans.FrameCfg} cfg Frame configuration * @return {aria.widgets.frames.Frame} A frame object, or null if an error occured (in this case, the error is * logged). diff --git a/src/aria/widgets/frames/FrameWithIcons.js b/src/aria/widgets/frames/FrameWithIcons.js index 3596ad9b7..265b1b918 100644 --- a/src/aria/widgets/frames/FrameWithIcons.js +++ b/src/aria/widgets/frames/FrameWithIcons.js @@ -110,10 +110,10 @@ Aria.classDefinition({ }, $statics : { /** - * Create a new frame according to the given configuration object. The type of frame used (either OldFrame, - * TableFrame or FixedHeightFrame) depends on the frame.frameType property of the skin class. If the skin defines icons - * around the frame, the frame returned is wrapped in a FrameWithIcons object, otherwise there is no - * FrameWithIcons object. + * Create a new frame according to the given configuration object. The type of frame used (either TableFrame or + * FixedHeightFrame) depends on the frame.frameType property of the skin class. If the skin defines icons around + * the frame, the frame returned is wrapped in a FrameWithIcons object, otherwise there is no FrameWithIcons + * object. * @param {aria.widgets.frames.CfgBeans.FrameCfg} cfg Frame configuration * @return {aria.widgets.frames.Frame} A frame object, or null if an error occured (in this case, the error is * logged). @@ -456,4 +456,4 @@ Aria.classDefinition({ } } -}); \ No newline at end of file +}); diff --git a/src/aria/widgets/frames/OldFrame.js b/src/aria/widgets/frames/OldFrame.js deleted file mode 100644 index f8aabac2c..000000000 --- a/src/aria/widgets/frames/OldFrame.js +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Copyright 2012 Amadeus s.a.s. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * FIXME: missing doc - */ -Aria.classDefinition({ - $classpath : 'aria.widgets.frames.OldFrame', - $extends : "aria.widgets.frames.Frame", - $constructor : function (cfg) { - - /* FIXME: missing doc of public/private/protected properties of this class */ - - this.$Frame.constructor.call(this, cfg); - this.setSkinObj(cfg.skinnableClass); - var cssRoot = cfg["oldStuff:cssRoot"]; - this._wName = cssRoot ? cssRoot : "DIV"; - var _initState = cfg.state; - this._initState = (_initState && this._skinObj.states[_initState]) - ? this._skinObj.states[_initState].frame - : this._skinObj.states.normal.frame; - if (this.innerWidth > -1) { - this.innerWidth -= (this._skinObj.spcLeft + this._skinObj.spcRight + this._skinObj.offsetLeft + 6); - } - if (this.innerHeight > -1) { - this.innerHeight -= (this._skinObj.spcTop + this._skinObj.spcBottom); - } - var sprType = this._sprTypes[this._skinObj.frame.frameType]; - this.domElementNbr = sprType.domElementNbr; - }, - $prototype : { - $init : function (p) { - p._sprTypes = { - "Old0" : { - markupBegin : p._markupBeginStd, - markupEnd : p._markupEndStd, - domElementNbr : 1 - }, - "Old1" : { - markupBegin : p._markupBeginBgRepeat, - markupEnd : p._markupEndBgRepeat, - domElementNbr : 1 - }, - "Old2" : { - markupBegin : p._markupBeginFixedHeight, - markupEnd : p._markupEndFixedHeight, - domElementNbr : 2 - } - }; - }, - - /** - * The main entry point into the Div begin markup. Here we check whether it is a Div, defined in the AriaSkin - * object, that has an image that is repeated as a background. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - writeMarkupBegin : function (out) { - var skinObj = this._skinObj; - var sprType = this._sprTypes[skinObj.frame.frameType]; - sprType.markupBegin.call(this, out); - skinObj = null; - }, - - /** - * The main entry point into the Div end markup. Here we check whether it is a Div, defined in the AriaSkin - * object, that has an image that is repeated as a background. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - writeMarkupEnd : function (out) { - var skinObj = this._skinObj; - var sprType = this._sprTypes[skinObj.frame.frameType]; - sprType.markupEnd.call(this, out); - skinObj = null; - }, - - /** - * A public method to set this objects skin object - * @param {String} widgetName - */ - setSkinObj : function (widgetName) { - this._skinObj = aria.widgets.AriaSkinInterface.getSkinObject(widgetName, this._cfg.sclass); - }, - - /** - * BEGINNING OF BACKGROUND REPEAT MARKUP METHODS The markup begin method for Divs defined in the AriaSkin object - * where the background is an image and is repeated. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - _markupBeginBgRepeat : function (out) { - var cfg = this._cfg, frameSkinObj = this._skinObj.frame, _sinit = this._initState, sprH = frameSkinObj.sprHeight, cfgH = cfg.height, cfgW = cfg.width, h = (cfgH === -1) - ? "" - : (cfgH > sprH) ? ";height:" + sprH + "px" : ";height:" + cfgH + "px", w = (cfgW === -1) - ? "" - : ";width:" + cfgW + "px"; - - out.write([''].join('')); - }, - - /** - * The markup end method for Divs defined in the AriaSkin object where the background is an image and is - * repeated. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - _markupEndBgRepeat : function (out) { - out.write(''); - }, - - /** - * BEGINNING OF FIXED HEIGHT MARKUP METHODS The markup begin method for the Divs that have a fixed height - * sprite. This means that the this._cfg height param isn't applicable. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - _markupBeginFixedHeight : function (out) { - var frameSkinObj = this._skinObj.frame, _sinit = this._initState, cfg = this._cfg, spcL = frameSkinObj.spcLeft, spcR = frameSkinObj.spcRight, spcT = frameSkinObj.spcTop, spcB = frameSkinObj.spcBottom, sprW = frameSkinObj.sprWidth, sprH = frameSkinObj.sprHeight, w = (cfg.width === -1) - ? "" - : (cfg.width > sprW) ? "width:" + (sprW - spcR) + "px;" : "width:" + (cfg.width - spcR - spcL - 6) - + "px;", topPos = _sinit.topPos = _sinit.sprIdx * (sprH + 2); - - // store so the markupEnd method can use it. - var h = frameSkinObj.h = 'height:' + (sprH - spcT - spcB) + 'px;'; - - out.write([''].join('')); - }, - - /** - * The markup end method for the Divs that have a fixed height sprite. This means that the cfg this._cfg height - * param isn't applicable. - * @param {aria.templates.MarkupWriter} out the writer Object to use to output markup - * @private - */ - _markupEndFixedHeight : function (out) { - var frameSkinObj = this._skinObj.frame, spcR = frameSkinObj.spcRight; - out.write(['', ' '].join('')); - delete(frameSkinObj.h); - }, - - /** - * BEGINNING OF STANDARD MARKUP METHODS The markup begin method for the Divs, defined in the AriaSkin object, - * with complex backgrounds from sprites. The html for this type of Div comes from the aria implementation. - * @param {aria.templates.MarkupWriter} out - * @private - */ - _markupBeginStd : function (out) { - - var cfg = this._cfg, sclass = cfg.sclass, frameSkinObj = this._skinObj.frame, _sinit = this._initState, _sprIdx = _sinit.sprIdx, offL = frameSkinObj.offsetLeft, spcL = frameSkinObj.spcLeft, spcT = frameSkinObj.spcTop, spcB = frameSkinObj.spcBottom, spcR = frameSkinObj.spcRight, sprW = frameSkinObj.sprWidth, sprH = frameSkinObj.sprHeight, topPos = _sinit.topPos = (_sprIdx) - * sprH + 2 * _sprIdx, // could be >0 if multiple sprites - cfgW = cfg.width, cfgH = cfg.height, w = cfgW > -1 ? cfgW - spcL : sprW - spcL, h = (cfgH === -1) - ? "" - : (cfgH > sprH) ? ";height:" + (sprH - spcB - spcT) + "px" : ";height:" + (cfgH - spcB - spcT) - + "px", wName = this._wName; - - if (cfgW > -1 && w > sprW) { - w = sprW; - } - out.write([ - // -------------------------------------- Container - '', - - // -------------------------------------- Top Row - '', - - ' ', - - '', - ''].join('')); - }, - /** - * The markup end method for the Divs, defined in the AriaSkin object, with complex backgrounds from sprites. - * @param {aria.templates.MarkupWriter} out - * @private - */ - _markupEndStd : function (out) { - var sclass = this._cfg.sclass, frameSkinObj = this._skinObj.frame, _sinit = this._initState, spcB = frameSkinObj.spcBottom, bottomPos = _sinit.topPos - + frameSkinObj.sprHeight - spcB, cfgW = this._cfg.width, sprW = frameSkinObj.sprWidth, spcL = frameSkinObj.spcLeft, w = cfgW > -1 - ? cfgW - spcL - : sprW - spcL, wName = this._wName; - - if (cfgW > -1 && w > sprW) - w = sprW; - - out.write([ - '', - '', - // -------------------------------------- Bottom Row - '', - ' ', '', - /* background-position:bottom left; */ - ''].join('')); - - }, - - /** - * FIXME: Missing doc - */ - changeState : function (stateName) { - this.$Frame.changeState.call(this, stateName); - this._changeState(this.getStateObject(), this._domElt); - }, - - /** - * The main handler method when a state change is required. - * @param {Object} state - A state object as defined in the skin object - * @param {DOMObject} dom - this dom object - * @private - */ - _changeState : function (state, dom) { - // change the color - dom.style.color = state.color; - // change the text align - dom.style.textAlign = state.textAlign; - var frameSkinObj = this._skinObj.frame; - // change the sprite background - // only for divs with a sprite background - if (!frameSkinObj.bgRepeat) { - var divs = dom.getElementsByTagName("span"), sprH = frameSkinObj.sprHeight, sprIdx = state.sprIdx, topPos = state.topPos; - if (divs.length === 0) { - divs = dom.parentNode.getElementsByTagName("span"); - } - if (!topPos) { - topPos = state.topPos = sprIdx * sprH + 2 * sprIdx; - } - var bottomPos = topPos + sprH - frameSkinObj.spcBottom, className; - for (var i = 0; i < divs.length; i++) { - className = divs[i].className; - if (className.match(/x[A-Z]{3}tr/) || className.match(/^x[A-X]{3}bkg_.*$/)) { - this.__changeBgPos(divs[i], topPos); - } else if (className.match(/x[A-Z]{3}br/)) { - this.__changeBgPos(divs[i], bottomPos); - } - - } - } - }, - - /** - * A helper method to change the background position - * @param {DOMObject} domObj - * @param {Integer} newVal - * @private - */ - __changeBgPos : function (domObj, newVal) { - var bgPos = domObj.style.backgroundPosition.split(" "); - domObj.style.backgroundPosition = bgPos[0] + " -" + newVal + "px"; - bgPos = null; - }, - - /** - * FIXME: missing doc - */ - linkToDom : function (domElt) { - this.$Frame.linkToDom.call(this, domElt); - var getDomElementChild = aria.utils.Dom.getDomElementChild; - var sprType = this._sprTypes[this._skinObj.frame.frameType]; - this._childRootElt = domElt; - }, - - /** - * Resize the frame to new dimensions. TODO: this function is not implemented yet for old frames - * @param {Number} width New width, or -1 to fit the content width - * @param {Number} height New height, or -1 to fit the content height - */ - resize : function (width, height) { - this.$Frame.resize.call(this, width, height); - // TODO: implement the resize functionality for old frames - } - - } -});