You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/15 16:28:45 UTC
openmeetings git commit: no jira: getOption is made fail-safe
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x e70d53af3 -> 431412bf1
no jira: getOption is made fail-safe
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/431412bf
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/431412bf
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/431412bf
Branch: refs/heads/4.0.x
Commit: 431412bf1ff554e6dbc7e8520159455e8e510fe2
Parents: e70d53a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 15 23:28:37 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 15 23:28:37 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/room/room.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/431412bf/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 557a28f..0e7e34c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -754,7 +754,7 @@ var Room = (function() {
self.init = _init;
self.getMenuHeight = function() { return menuHeight; };
- self.getOptions = function() { return JSON.parse(JSON.stringify(options)); };
+ self.getOptions = function() { return typeof options === 'object' ? JSON.parse(JSON.stringify(options)) : {}; };
self.setRights = function(_r) { return options.rights = _r; };
self.setSize = _setSize;
self.load = _load;