Author: solomax
Date: Tue Feb 21 07:50:05 2017
New Revision: 1783839
URL: http://svn.apache.org/viewvc?rev=1783839&view=rev
Log:
[OPENMEETINGS-1572] chat is made resizable
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1783839&r1=1783838&r2=1783839&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
Tue Feb 21 07:50:05 2017
@@ -120,8 +120,8 @@ public class Chat extends Panel {
public static CharSequence getReinit() {
StringBuilder sb = new StringBuilder("chatReinit(");
- sb.append('\'').append(ID_ALL).append('\'')
-
.append(',').append('\'').append(ID_ROOM_PREFIX).append('\'');
+ sb.append('\'').append(Application.getString(1494)).append('\'')
+
.append(',').append('\'').append(Application.getString(406)).append('\'');
return sb.append("); ");
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1783839&r1=1783838&r2=1783839&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Tue Feb 21 07:50:05 2017
@@ -59,6 +59,17 @@ function chatReinit(_allPrefix, _roomPre
$("#" + panelId).remove();
chatTabs.tabs("refresh");
});
+ $('#chatPanel').resizable({
+ handles: "n, w"
+ , disabled: chatClosed()
+ , alsoResize: "#chat, #chat .ui-tabs .ui-tabs-panel.messageArea"
+ , minHeight: 195
+ , minWidth: 260
+ , stop: function(event, ui) {
+ $('#chatPanel').css({'top': '', 'left': ''});
+ openedHeight = ui.size.height + "px";
+ }
+ });
}
function chatClosed() {
return $('#chatPanel').height() < 24;
@@ -68,6 +79,7 @@ function openChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-n').addClass('ui-icon-caret-1-s');
$('#chat .control.block').removeClass('ui-state-highlight');
$('#chatPanel, #chat').animate({height: openedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", false);
}
}
function closeChat() {
@@ -75,6 +87,7 @@ function closeChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-s').addClass('ui-icon-caret-1-n');
$('#chatPanel').animate({height: closedHeight}, 1000);
$('#chatPanel, #chat').animate({height: closedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", true);
}
}
function toggleChat() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1783839&r1=1783838&r2=1783839&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
Tue Feb 21 07:50:05 2017
@@ -120,8 +120,8 @@ public class Chat extends Panel {
public static CharSequence getReinit() {
StringBuilder sb = new StringBuilder("chatReinit(");
- sb.append('\'').append(ID_ALL).append('\'')
-
.append(',').append('\'').append(ID_ROOM_PREFIX).append('\'');
+ sb.append('\'').append(Application.getString(1494)).append('\'')
+
.append(',').append('\'').append(Application.getString(406)).append('\'');
return sb.append("); ");
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1783839&r1=1783838&r2=1783839&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Tue Feb 21 07:50:05 2017
@@ -59,6 +59,17 @@ function chatReinit(_allPrefix, _roomPre
$("#" + panelId).remove();
chatTabs.tabs("refresh");
});
+ $('#chatPanel').resizable({
+ handles: "n, w"
+ , disabled: chatClosed()
+ , alsoResize: "#chat, #chat .ui-tabs .ui-tabs-panel.messageArea"
+ , minHeight: 195
+ , minWidth: 260
+ , stop: function(event, ui) {
+ $('#chatPanel').css({'top': '', 'left': ''});
+ openedHeight = ui.size.height + "px";
+ }
+ });
}
function chatClosed() {
return $('#chatPanel').height() < 24;
@@ -68,6 +79,7 @@ function openChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-n').addClass('ui-icon-caret-1-s');
$('#chat .control.block').removeClass('ui-state-highlight');
$('#chatPanel, #chat').animate({height: openedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", false);
}
}
function closeChat() {
@@ -75,6 +87,7 @@ function closeChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-s').addClass('ui-icon-caret-1-n');
$('#chatPanel').animate({height: closedHeight}, 1000);
$('#chatPanel, #chat').animate({height: closedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", true);
}
}
function toggleChat() {
