jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1737 reset padding only if previous theme had custom padding

Browse source
This commit is contained in:
nightwing 2013-12-30 02:05:57 +04:00
commit 425404ff29
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ace/virtual_renderer.js
View file

@ -1495,6 +1495,11 @@ var VirtualRenderer = function(container, theme) {
if (_self.theme) if (_self.theme)
dom.removeCssClass(_self.container, _self.theme.cssClass); dom.removeCssClass(_self.container, _self.theme.cssClass);
var padding = "padding" in module ? module.padding
: "padding" in (_self.theme || {}) ? 4 : _self.$padding;
if (_self.$padding && padding != _self.$padding)
_self.setPadding(padding);
// this is kept only for backwards compatibility // this is kept only for backwards compatibility
_self.$theme = module.cssClass; _self.$theme = module.cssClass;
@ -1502,10 +1507,6 @@ var VirtualRenderer = function(container, theme) {
dom.addCssClass(_self.container, module.cssClass); dom.addCssClass(_self.container, module.cssClass);
dom.setCssClass(_self.container, "ace_dark", module.isDark); dom.setCssClass(_self.container, "ace_dark", module.isDark);
var padding = "padding" in module ? module.padding : 4;
if (_self.$padding && padding != _self.$padding)
_self.setPadding(padding);
// force re-measure of the gutter width // force re-measure of the gutter width
if (_self.$size) { if (_self.$size) {
_self.$size.width = 0; _self.$size.width = 0;