resolved problem with AdBlock plugin (complaining with shareContainer class)
git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@93892 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
d240989512
commit
adfc37a961
|
@ -1,15 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src/main/webapp" />
|
||||
<classpathentry kind="con"
|
||||
path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
|
||||
<classpathentry kind="con"
|
||||
path="org.eclipse.wst.jsdt.launching.WebProject">
|
||||
<attributes>
|
||||
<attribute name="hide" value="true" />
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con"
|
||||
path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
|
||||
<classpathentry kind="output" path="" />
|
||||
<classpathentry excluding="js/jquery.min.js" kind="src" path="src/main/webapp"/>
|
||||
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
|
||||
<attributes>
|
||||
<attribute name="hide" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
|
||||
<classpathentry kind="output" path=""/>
|
||||
</classpath>
|
||||
|
|
|
@ -1 +1 @@
|
|||
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
|
||||
org.eclipse.wst.jsdt.launching.JRE_CONTAINER
|
|
@ -0,0 +1 @@
|
|||
Global
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:m="urn:import:org.gcube.portlets.user.shareupdates.client.view"
|
||||
xmlns:j="urn:import:org.gcube.portlets.widgets.fileupload.client.view">
|
||||
<g:HTMLPanel ui:field="mainPanel">
|
||||
<table class="shareContainer">
|
||||
<table class="tab-main-container">
|
||||
<tr>
|
||||
<td width="60px;" align="middle" valign="top">
|
||||
<a href="">
|
||||
|
|
|
@ -34,7 +34,7 @@ public class SuperPosedTextArea extends TextArea {
|
|||
PickUsersDialog pickUserDlg;
|
||||
public final static int ARROW_UP = 38;
|
||||
public final static int ARROW_DOWN = 40;
|
||||
|
||||
|
||||
private ArrayList<String> mentionedUsers = new ArrayList<String>();
|
||||
|
||||
/**
|
||||
|
@ -58,7 +58,7 @@ public class SuperPosedTextArea extends TextArea {
|
|||
}
|
||||
});
|
||||
DOM.setElementAttribute(getElement(), "id", "postTextArea");
|
||||
bind();
|
||||
bind();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -132,7 +132,7 @@ public class SuperPosedTextArea extends TextArea {
|
|||
// re-inject the processed text into the div
|
||||
DOM.getElementById("highlighter").setInnerHTML(text);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* events binder
|
||||
*/
|
||||
|
@ -143,19 +143,19 @@ public class SuperPosedTextArea extends TextArea {
|
|||
|
||||
String toAdd = event.getSelectedUser().getFullName();
|
||||
mentionedUsers.add(toAdd);
|
||||
|
||||
|
||||
String[] toSplit = getText().split("@"); //get the preceeding part
|
||||
|
||||
|
||||
setText(toSplit[0]+toAdd);
|
||||
Element highDiv = DOM.getElementById("highlighter");
|
||||
|
||||
|
||||
String[] htmlToSplit = highDiv.getInnerHTML().split("@"); //get the preceeding part
|
||||
String highLightedUser = "<span class=\"highlightedUser\">"+toAdd+"</span>";
|
||||
highDiv.setInnerHTML(htmlToSplit[0]+highLightedUser);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public ArrayList<String> getMentionedUsers() {
|
||||
ArrayList<String> toReturn = new ArrayList<String>();
|
||||
for (String mentionedUser : mentionedUsers) {
|
||||
|
|
|
@ -226,7 +226,7 @@ a.link:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.shareContainer {
|
||||
.tab-main-container {
|
||||
width: 600px;
|
||||
background-clip: border-box;
|
||||
background-image: none;
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
<script type="text/javascript"
|
||||
src="shareupdates/shareupdates.nocache.js"></script>
|
||||
<script
|
||||
src='http://ajax.googleapis.com/ajax/libs/jquery/1.10.0/jquery.min.js'></script>
|
||||
|
||||
<script src='js/jquery.min.js'></script>
|
||||
<script src='js/jquery.autosize.js'></script>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" language="javascript"
|
||||
<script type="text/javascript"
|
||||
src='<%=request.getContextPath()%>/shareupdates/shareupdates.nocache.js'></script>
|
||||
<script
|
||||
src='http://ajax.googleapis.com/ajax/libs/jquery/1.10.0/jquery.min.js'></script>
|
||||
<script src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>
|
||||
|
||||
<script type="text/javascript" src='<%=request.getContextPath()%>/js/jquery.min.js'></script>
|
||||
<script type="text/javascript" src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
setTimeout(function(){
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue