rodolphe/chromesoul
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Koalab/chromesoul

Browse source 
Conflicts:
	lib/options.js
	lib/tab.nsui.js
This commit is contained in:
Belga 2014-10-30 22:57:57 +01:00
commit 1e32155fde
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/options.js
View file

@ -158,4 +158,3 @@ OptionsManager.prototype.setElemValue = function(elem, val) {
} }
}; };

1
lib/tab.nsui.js
View file

@ -132,6 +132,7 @@ Tab.prototype.hide = function() {
}; };
Tab.prototype.show = function() { Tab.prototype.show = function() {
this.options.restore();
if (typeof this.showHandler !== "undefined") { if (typeof this.showHandler !== "undefined") {
this.showHandler(); this.showHandler();
} }