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

Corrige bugs causados por rastros de Dijit

parent 208276a9
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
define([
	"dijit/layout/BorderContainer"
	"dijit/layout/LayoutContainer"
	, "dijit/layout/ContentPane"
	, "dojo/_base/declare"
	, "dojo/_base/lang"
	, "dojo/dom-style"
	, "dojo/aspect"
	, "redmic/modules/components/Keypad/TrizoneKeypadImpl"
], function(
	BorderContainer
	LayoutContainer
	, ContentPane
	, declare
	, lang
	, domStyle
	, aspect
	, TrizoneKeypadImpl
){
@@ -100,13 +98,12 @@ define([

		postCreate: function() {

			var border = new BorderContainer();
			var border = new LayoutContainer();

			this.buttonContentPane = new ContentPane({
				region: "bottom"
			});

			domStyle.set(this.containerNode, "margin", "5px");
			border.addChild(this);
			border.addChild(this.buttonContentPane);

+2 −3
Original line number Diff line number Diff line
@@ -82,12 +82,11 @@ define([
			});

			this.leftNode = new declare(StackContainer)({
				splitter: true,
				region: "left",
				'class': "col-xs-6 col-sm-5 col-md-4 col-lg-4 hardTexturedContainer sideStackContainer"
				'class': "hardTexturedContainer sideStackContainer"
			});

			this.contentNode.addChild(this.leftNode);
			this.addChild(this.leftNode);

			this.leftNode.addChild(this.leftContainer);

+6 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ define([
	"app/designs/base/_Main"
	, "app/designs/mapWithSideContent/Controller"
	, "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar"
	, "dijit/layout/BorderContainer"
	, "dijit/layout/LayoutContainer"
	, "dijit/layout/ContentPane"
	, "dijit/layout/StackContainer"
	, "dojo/_base/declare"
@@ -20,7 +20,7 @@ define([
	_Main
	, Controller
	, Layout
	, BorderContainer
	, LayoutContainer
	, ContentPane
	, StackContainer
	, declare
@@ -158,7 +158,7 @@ define([
				node: this.gridNode.domNode
			});

			this.browserAndSearchContainer = new BorderContainer({
			this.browserAndSearchContainer = new LayoutContainer({
				title: "<i class='fa fa-table'></i>",
				'class': "marginedContainer noScrolledContainer"
			});
@@ -166,16 +166,15 @@ define([
			this.browserAndSearchContainer.addChild(this.gridNode);

			this.leftNode = new declare(StackContainer)({
				splitter: true,
				region: "left",
				'class': "col-xs-6 col-sm-5 col-md-4 col-lg-4 hardTexturedContainer sideStackContainer"
				'class': "hardSolidContainer sideStackContainer"
			});
			this.leftNode.addChild(this.browserAndSearchContainer);

			this.contentNode.addChild(this.leftNode);
			this.addChild(this.leftNode);

			this._publish(this.filteringInput.getChannel("SHOW"), {
				node: this.topbarNode.domNode
				node: this.topbarNode
			});

			this._emitEvt('ADD_LAYER', {layer: this.geoJsonLayer});
+3 −3
Original line number Diff line number Diff line
define([
	"dijit/layout/BorderContainer"
	"dijit/layout/LayoutContainer"
	, "dijit/layout/ContentPane"
	, "dojo/_base/declare"
	, "dojo/_base/lang"
@@ -7,7 +7,7 @@ define([
	, "redmic/modules/base/SelectionBox"
	, "put-selector/put"
], function(
	BorderContainer
	LayoutContainer
	, ContentPane
	, declare
	, lang
@@ -46,7 +46,7 @@ define([
				'class': "frameworkTree containerSelectionBox"
			});

			this.contentNode = new BorderContainer({
			this.contentNode = new LayoutContainer({
				region: "center"
			});

+1 −1

File changed.

Contains only whitespace changes.