Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE, PE] Реализовано открытие пустой правой панели во время загрузки документа. fix Bug 32119

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-25 10:44:18 +03:00
parent 6b400523ef
commit 14fdcdd66e
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/template/RightMenu.template
View file

@ -16,6 +16,8 @@
</div> </div>
<div id="id-textart-settings" class="settings-panel"> <div id="id-textart-settings" class="settings-panel">
</div> </div>
<div id="id-empty-settings" class="settings-panel">
</div>
</div> </div>
<div class="tool-menu-btns"> <div class="tool-menu-btns">
<div class="ct-btn-category arrow-left" /> <div class="ct-btn-category arrow-left" />

9
apps/documenteditor/main/app/view/RightMenu.js
View file

@ -142,7 +142,9 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
el.css('width', '40px'); var open = Common.localStorage.getItem("de-hide-right-settings");
open = (open===null || parseInt(open) == 0);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show(); el.show();
el.html(this.template({})); el.html(this.template({}));
@ -194,6 +196,11 @@ define([
}); });
} }
if (open) {
$('#id-empty-settings').parent().css("display", "inline-block" );
$('#id-empty-settings').addClass("active");
}
this.trigger('render:after', this); this.trigger('render:after', this);
return this; return this;

2
apps/presentationeditor/main/app/template/RightMenu.template
View file

@ -14,6 +14,8 @@
</div> </div>
<div id="id-textart-settings" class="settings-panel"> <div id="id-textart-settings" class="settings-panel">
</div> </div>
<div id="id-empty-settings" class="settings-panel">
</div>
</div> </div>
<div class="tool-menu-btns"> <div class="tool-menu-btns">
<div class="ct-btn-category arrow-left" /> <div class="ct-btn-category arrow-left" />

9
apps/presentationeditor/main/app/view/RightMenu.js
View file

@ -141,7 +141,9 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
el.css('width', '40px'); var open = Common.localStorage.getItem("pe-hide-right-settings");
open = (open===null || parseInt(open) == 0);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show(); el.show();
el.html(this.template({})); el.html(this.template({}));
@ -178,6 +180,11 @@ define([
}); });
} }
if (open) {
$('#id-empty-settings').parent().css("display", "inline-block" );
$('#id-empty-settings').addClass("active");
}
this.trigger('render:after', this); this.trigger('render:after', this);
return this; return this;