Commit a848749b authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina vista detalle relativa, simplifica resize 

Todas las vistas de detalle ahora crecen en vertical tanto como
necesiten, el antiguo modo ajustado al alto de la ventana ha dejado de
tener sentido.

Se suprime el nodo superpuesto en la zona de resize de las ventanas, ya
que causaba más problemas de los que solventaba.
parent 61fc9aae

public/javascript/app/designs/details/Controller.js

+1 −5
Original line number Diff line number Diff line
@@ -43,10 +43,8 @@ define([ 


				idProperty: "id",

				hiddenClass: "hidden",

				noScroll: false,



				_relativeRowsParameterName: "data-percentage-rows",

				_fixedRowsParameterName: "data-rows",

				_rowsParameterName: "data-rows",

				_colsParameterName: "data-cols",

				_updateInteractiveTimeout: 100,
@@ -124,8 +122,6 @@ define([ 


		_buildVisualization: function() {



			this._rowsParameterName = this.noScroll ? this._relativeRowsParameterName : this._fixedRowsParameterName;



			var dfds = [];

			for (var key in this.widgetConfigs) {

				dfds.push(this._buildWidgetVisualization(key));

public/javascript/app/designs/details/Layout.js

+1 −3
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@ define([ 
	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

	, 'put-selector/put'

], function (

	_Layout

	, declare

	, lang

	, aspect

	, put

){

	return declare(_Layout, {
@@ -30,7 +28,7 @@ define([ 


			this.inherited(arguments);



			this.addChild(this.centerNode);

			put(this.domNode, this.centerNode);

		}

	});

});

public/javascript/redmic/modules/base/_Window.js

+5 −26
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ define([ 
		maxWidthCols: 6,



		resizableBottomPadding: 15,

		resizableBottomMargin: 0.2,



		scrollMargin: 10,
@@ -113,7 +112,7 @@ define([ 
			this._windowNode = put(node, 'div.' + containerClass);



			if (this.resizable) {

				this._createWindowResizeComponents();

				this._limitMaxHeightToAvailableHeight();

			}



			if (!this.omitTitleBar) {
@@ -125,14 +124,6 @@ define([ 
			this._addNodeListeners();

		},



		_createWindowResizeComponents: function() {



			this._limitMaxHeightToAvailableHeight();



			this._resizeHandleNode = put('i.' + this.resizeHandleClass);

			put(this._windowNode, this._resizeHandleNode);

		},



		_limitMaxHeightToAvailableHeight: function() {



			var currMaxHeight = window.innerHeight;
@@ -155,10 +146,6 @@ define([ 
			var contentClass = this.windowContentClass,

				contentHeightReduction = this.titleHeight;



			if (this.resizable) {

				contentHeightReduction += this.resizableBottomMargin;

			}



			if (this.omitTitleBar) {

				contentClass += '.' + this.windowWithoutTitleContentClass;

				contentHeightReduction = 0;
@@ -210,7 +197,7 @@ define([ 
				this._minimizeDfd.resolve();

			}



			if (propName === 'width' && this._maximizeDfd) {

			if ((propName === 'width' || propName === 'transform') && this._maximizeDfd) {

				this._maximizeDfd.resolve();

			}

		},
@@ -325,11 +312,12 @@ define([ 
		_decorateTitleNode: function() {



			var windowTitle = this.windowTitle || this.getOwnChannel(),

				titleTextValue = this.i18n[windowTitle] || this.title || this.getOwnChannel();

				titleTextValue = this.i18n[windowTitle] || this.title || this.getOwnChannel(),

				titleAttr = '[title="' + titleTextValue + '"]';



			put(this._windowTitleNode, '[id="' + windowTitle + '"]');



			put(this._windowTitleNode, 'div.' + this.windowTitleValueClass, titleTextValue);

			put(this._windowTitleNode, 'div.' + this.windowTitleValueClass + titleAttr, titleTextValue);



			if (!this.omitTitleButtons) {

				this._createWindowButtons();
@@ -363,10 +351,6 @@ define([ 
				this._minimizeButton.onclick = lang.hitch(this, this._minimizeModuleReturn);

			}



			if (this.resizable) {

				domClass.add(this._resizeHandleNode, this.hiddenClass);

			}



			domStyle.set(this.node, 'height', 0);

			domStyle.set(this._windowNode.parentNode, 'height', this.titleHeight + 'rem');

		},
@@ -381,11 +365,6 @@ define([ 


			var contentHeightReduction = this.titleHeight;



			if (this.resizable) {

				domClass.remove(this._resizeHandleNode, this.hiddenClass);

				contentHeightReduction += this.resizableBottomMargin;

			}



			domStyle.set(this.node, 'height', 'calc(100% - ' + contentHeightReduction + 'rem)');

			domStyle.set(this._windowNode.parentNode, 'height', '');

		},

public/javascript/redmic/modules/layout/TabsDisplayer.js

+6 −1
Original line number Diff line number Diff line
@@ -80,11 +80,16 @@ define([ 


		_onMeOrAncestorResized: function(req) {



			this._container.resize();

			this._resizeTabs();

		},



		_afterShow: function() {



			this._resizeTabs();

		},



		_resizeTabs: function() {



			this._container.resize();

		},

stylesheets @ 727f37df

Compare 15aa621d to 727f37df
Original line number Diff line number Diff line 
Subproject commit 15aa621d7d4bf0f5dfee360a431f0add37b5558d
 
Subproject commit 727f37dfd74b39d19bc4f1a4fe03804f74b65747