Merge branch 'ed'

This commit is contained in:
edsilv 2015-02-09 21:19:07 +00:00
commit 1f494b16d1
2 changed files with 8 additions and 0 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ build/
sftp-config.json sftp-config.json
coverage/ coverage/
temp/ temp/
.idea

View File

@ -826,6 +826,13 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
return this; return this;
}, },
hideControls: function() {
beginControlsAutoHide(this);
},
showControls: function() {
abortControlsAutoHide(this);
},
/** /**
* @function * @function