Repository: openmeetings Updated Branches: refs/heads/3.3.x 1c9a0dfe5 -> f4f33fe2b
no jira: network testing was broken Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f4f33fe2 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f4f33fe2 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f4f33fe2 Branch: refs/heads/3.3.x Commit: f4f33fe2baeb0e56e8d77afeb1a0dcf14725cd94 Parents: 1c9a0df Author: Maxim Solodovnik <[email protected]> Authored: Wed May 17 00:53:14 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed May 17 00:53:14 2017 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/SwfPanel.java | 2 +- .../main/java/org/apache/openmeetings/web/room/swf-functions.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f4f33fe2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java index 5d92663..2c537dd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java @@ -163,7 +163,7 @@ public class SwfPanel extends BasePanel { JSONObject options = new JSONObject().put("src", swf + new PageParametersEncoder().encodePageParameters(pp)); ClientProperties cp = WebSession.get().getClientInfo().getProperties(); options.put("wmode", cp.isBrowserInternetExplorer() && cp.getBrowserVersionMajor() == 11 ? "opaque" : "direct"); - initStr = String.format("var labels = %s; initSwf(%s);", lbls, options.toString()); + initStr = String.format("labels = %s; initSwf(%s);", lbls, options.toString()); } return initStr; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f4f33fe2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js index 5ecc512..90f952e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - +var labels function initSwf(_options) { var options = $.extend({ allowfullscreen : 'true',
