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 2016/09/02 16:57:36 UTC
svn commit: r1758989 - in /openmeetings/application:
branches/3.2.x/openmeetings-flash/src/main/swf/base/
branches/3.2.x/openmeetings-flash/src/main/swf/video/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/...
Author: solomax
Date: Fri Sep 2 16:57:36 2016
New Revision: 1758989
URL: http://svn.apache.org/viewvc?rev=1758989&view=rev
Log:
[OPENMEETINGS-1376] initial work on settings button
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1758989&r1=1758988&r2=1758989&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx Fri Sep 2 16:57:36 2016
@@ -31,6 +31,19 @@
ExternalInterface.addCallback("redirectToUrlCallback", redirectToUrlCallback);
ExternalInterface.addCallback("getBrowserInfoCallback", getBrowserInfoCallback);
ExternalInterface.addCallback("getBrowserLangCallback", getBrowserLangCallback);
+ ExternalInterface.addCallback("showAvSettings", function(isInterview) {
+ //FIXME TODO unify
+ if (canvas.inner.editRecordStream != null) {
+ canvas.inner.editRecordStream.destroy();
+ new lz.editRecordStreamSWF10(canvas.inner, {
+ name: "editRecordStream"
+ , isSyncUpdate: true
+ , isInterview: isInterview
+ , standalone: true
+ //, interviewPodId: interviewPodId
+ });
+ }
+ });
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1758989&r1=1758988&r2=1758989&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Fri Sep 2 16:57:36 2016
@@ -114,12 +114,6 @@
<![CDATA[
//Make this view the upmost in the z-Index order
canvas.inner.bringToFront();
- if (standalone) {
- _titlebar.setAttribute('visible', false);
- lz.Cursor.showHandCursor(false);
- lz.Cursor.unlock();
- }
-
this.counterDelegate = new LzDelegate(this, "count");
if ($debug) Debug.write("this.myvideocontainer ",this.myvideocontainer);
@@ -855,7 +849,7 @@
<handler name="onclick">
//parent.cleanVideos();
this.parent.storelocaldata();
- new lz.labelerrorPopup(this.parent, {errorlabelid: 'save.success', labelid: '203'});
+ //new lz.labelerrorPopup(this.parent, {errorlabelid: 'save.success', labelid: '203'});
</handler>
</simpleLabelButton>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java?rev=1758989&r1=1758988&r2=1758989&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java Fri Sep 2 16:57:36 2016
@@ -18,11 +18,9 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon;
-import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
-
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.room.RoomPanel.Action;
public class SettingsIcon extends ClientIcon {
private static final long serialVersionUID = 1L;
@@ -44,6 +42,6 @@ public class SettingsIcon extends Client
@Override
protected String getScript() {
- return String.format("%s('%s', '%s');", FUNC_ACTION, Action.settings.name(), client.getUid());
+ return String.format("$('#lzapp').showAvSettings(%s);", Room.Type.interview == room.getRoom().getType());
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java?rev=1758989&r1=1758988&r2=1758989&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java Fri Sep 2 16:57:36 2016
@@ -18,11 +18,9 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon;
-import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
-
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.room.RoomPanel.Action;
public class SettingsIcon extends ClientIcon {
private static final long serialVersionUID = 1L;
@@ -44,6 +42,6 @@ public class SettingsIcon extends Client
@Override
protected String getScript() {
- return String.format("%s('%s', '%s');", FUNC_ACTION, Action.settings.name(), client.getUid());
+ return String.format("$('#lzapp').showAvSettings(%s);", Room.Type.interview == room.getRoom().getType());
}
}