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 2018/01/28 03:00:44 UTC
openmeetings git commit: [OPENMEETINGS-1817] link in chat should
workas expected
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 2bcafa61d -> e5bf05809
[OPENMEETINGS-1817] link in chat should workas expected
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e5bf0580
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e5bf0580
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e5bf0580
Branch: refs/heads/4.0.x
Commit: e5bf0580950868bd35143654aaa79f847ec948d7
Parents: 2bcafa6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 28 10:00:35 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 28 10:00:35 2018 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/user/chat/ChatToolbar.html | 6 +++---
.../org/apache/openmeetings/web/user/chat/ChatToolbar.java | 4 +++-
.../java/org/apache/openmeetings/web/user/chat/chat-base.js | 9 ++++++++-
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e5bf0580/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index 8e5da6c..4c217f0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -63,10 +63,10 @@
<li><a class="chat-btn chat-tool-icon btn btn-default" id="underline" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a></li>
</ul>
</div>
- <div class="btn-group">
+ <div class="btn-group dropup">
<a id="hyperlink" class="chat btn chat-tool-icon btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"> </a>
- <div class="dropdown-menu input-append">
- <input class="span2" placeholder="URL" type="text"/>
+ <div wicket:id="hyperlink" class="dropdown-menu input-append">
+ <input class="span2" placeholder="URL" type="text" onkeypress="if (event.keyCode === 13) {$(this).parent().find('button').trigger('click');}; return event.keyCode !== 13;"/>
<button class="btn btn-default" type="button"><wicket:message key="1261"/></button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e5bf0580/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index 92a5c40..b8d09b1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -37,6 +37,7 @@ import org.apache.openmeetings.db.dao.basic.ChatDao;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
+import org.apache.openmeetings.web.pages.BasePage;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -167,7 +168,8 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
@Override
protected void onInitialize() {
super.onInitialize();
- add(toolbar);
+ BasePage page = (BasePage)getPage();
+ add(toolbar.add(new WebMarkupContainer("hyperlink").add(AttributeModifier.append("class", page.isRtl() ? "dropdown-menu-left" : "dropdown-menu-right"))));
add(download);
delBtn = new ConfirmableAjaxBorder("delete", getString("80"), getString("832"), chatForm) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e5bf0580/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
index 0d4a8cf..8eadd43 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
@@ -379,7 +379,14 @@ var Chat = function() {
if ('' === text) {
return;
}
- const a = $('<div>').append($('<a></a>').attr('target', '_blank').attr('href', text).text(text)).html();
+ let url = text.trim();
+ if ('' === url) {
+ return;
+ }
+ if (!/^(https?:)?\/\//i.test(url)) {
+ url = 'http://' + url;
+ }
+ const a = $('<div>').append($('<a></a>').attr('target', '_blank').attr('href', url).text(url)).html();
if (window.getSelection) {
const sel = window.getSelection();
if (sel.rangeCount) {