Skip to content

O
Openfire
Commit e42d9550 authored by Guus der Kinderen's avatar Guus der Kinderen Committed by daryl herzmann
Browse files
Options

OF-1512: Update inVerse plugin to version 3.3.4 (#1048) 

This updates the inVerse plugin to use the latest upstream release. As suggested by JC, it's author,
I've also disabled the 'viewMode' configuration option for now (this should be reenabled in future
releases).
parent 02c22eaa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 417 deletions
src/plugins/inverse/changelog.html
View file @ e42d9550
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
inVerse Plugin Changelog inVerse Plugin Changelog
</h1> </h1>
<p><b>3.3.4 Release 1</b> -- March 15th, 2018</p>
<ul>
<li><a href="https://issues.igniterealtime.org/browse/OF-1511">OF-1511: upgrade to converse.js 3.3.4.</a></li>
</ul>
<p><b>3.3.2 Release 1</b> -- February 5th, 2018</p> <p><b>3.3.2 Release 1</b> -- February 5th, 2018</p>
<ul> <ul>
<li><a href="https://issues.igniterealtime.org/browse/OF-1473">OF-1473: upgrade to converse.js 3.3.2.</a></li> <li><a href="https://issues.igniterealtime.org/browse/OF-1473">OF-1473: upgrade to converse.js 3.3.2.</a></li>
......
src/plugins/inverse/classes/index.html
View file @ e42d9550
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title>inVerse</title> <title>inVerse</title>
<link rel="shortcut icon" type="image/ico" href="inverse/css/images/favicon.ico"/> <link rel="shortcut icon" type="image/ico" href="inverse/css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="inverse/css/inverse.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="inverse/css/inverse.min.css" />
<script src="inverse/dist/inverse.min.js"></script> <script src="inverse/dist/converse.min.js"></script>
</head> </head>
<body> <body>
<div class="content"> <div class="content">
...@@ -14,16 +14,42 @@ ...@@ -14,16 +14,42 @@
<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1> <h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>
</div> </div>
</div> </div>
<script src="jquery/dist/jquery.min.js"></script>
<script> <script>
$( document ).ready( function() function ready(fn) {
if (document.attachEvent ? document.readyState === "complete" : document.readyState !== "loading"){
fn();
} else {
document.addEventListener('DOMContentLoaded', fn);
}
}
function initConverse()
{ {
var config = {}; var request = new XMLHttpRequest();
$.getJSON( 'config.json', function ( config ) request.open( 'GET', 'config.json', true );
request.onload = function ()
{ {
converse.initialize( config ); if ( request.status >= 200 && request.status < 400 )
}); {
}); var config = JSON.parse( request.responseText );
converse.initialize( config );
}
else
{
console.error( "We reached our target server, but it returned an error: " + request.status );
}
};
request.onerror = function ( e )
{
console.error( "There was a connection error of some sort:" + e );
};
request.send();
}
ready( initConverse );
</script> </script>
</body> </body>
</html> </html>
src/plugins/inverse/classes/inverse/css/images/arrow.svg deleted 100644 → 0
View file @ 02c22eaa
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
<line x1="0" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
<line x1="24" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
</svg>
\ No newline at end of file
src/plugins/inverse/classes/inverse/css/images/bgbl.svg deleted 100644 → 0
View file @ 02c22eaa
<!--
Tessellate 1.0 by HTML5 UP
html5up.net | @n33co
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
<style type="text/css"><![CDATA[
line
{
stroke: rgba(255,255,255,0.1);
stroke-width: 0.85px;
}
]]></style>
<line x1="-180" y1="0" x2="820" y2="1000" />
<line x1="-380" y1="0" x2="620" y2="1000" />
<line x1="-530" y1="0" x2="470" y2="1000" />
<line x1="-655" y1="0" x2="345" y2="1000" />
<line x1="-755" y1="0" x2="245" y2="1000" />
<line x1="-830" y1="0" x2="170" y2="1000" />
<line x1="-880" y1="0" x2="120" y2="1000" />
<line x1="-920" y1="0" x2="80" y2="1000" />
<line x1="-950" y1="0" x2="50" y2="1000" />
<line x1="-970" y1="0" x2="30" y2="1000" />
<line x1="-985" y1="0" x2="15" y2="1000" />
<line x1="-995" y1="0" x2="5" y2="1000" />
</svg>
\ No newline at end of file
src/plugins/inverse/classes/inverse/css/images/bgtr.svg deleted 100644 → 0
View file @ 02c22eaa
<!--
Tessellate 1.0 by HTML5 UP
html5up.net | @n33co
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
<style type="text/css"><![CDATA[
line
{
stroke: rgba(255,255,255,0.1);
stroke-width: 0.85px;
}
]]></style>
<line x1="180" y1="0" x2="1180" y2="1000" />
<line x1="380" y1="0" x2="1380" y2="1000" />
<line x1="530" y1="0" x2="1530" y2="1000" />
<line x1="655" y1="0" x2="1655" y2="1000" />
<line x1="755" y1="0" x2="1775" y2="1000" />
<line x1="830" y1="0" x2="1830" y2="1000" />
<line x1="880" y1="0" x2="1880" y2="1000" />
<line x1="920" y1="0" x2="1920" y2="1000" />
<line x1="950" y1="0" x2="1970" y2="1000" />
<line x1="970" y1="0" x2="1970" y2="1000" />
<line x1="985" y1="0" x2="1985" y2="1000" />
<line x1="995" y1="0" x2="1995" y2="1000" />
</svg>
\ No newline at end of file
src/plugins/inverse/classes/inverse/css/images/dark-arrow.svg deleted 100644 → 0
View file @ 02c22eaa
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
<line x1="0" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
<line x1="24" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
</svg>
\ No newline at end of file
src/plugins/inverse/classes/inverse/css/inverse.min.css
View file @ e42d9550
This source diff could not be displayed because it is too large. You can view the blob instead.
src/plugins/inverse/classes/inverse/dist/converse.min.js 0 → 100644
View file @ e42d9550
This diff is collapsed.
src/plugins/inverse/classes/jquery/dist/jquery.min.js deleted 100644 → 0
View file @ 02c22eaa
This diff is collapsed.
src/plugins/inverse/plugin.xml
View file @ e42d9550
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<name>inVerse</name> <name>inVerse</name>
<description>Adds the (third-party) inVerse web client to Openfire.</description> <description>Adds the (third-party) inVerse web client to Openfire.</description>
<author>Guus der Kinderen</author> <author>Guus der Kinderen</author>
<version>3.3.2 Release 1</version> <version>3.3.4 Release 1</version>
<date>02/05/2018</date> <date>03/15/2018</date>
<minServerVersion>4.1.5</minServerVersion> <minServerVersion>4.1.5</minServerVersion>
<adminconsole> <adminconsole>
<tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp"> <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp">
......
src/plugins/inverse/pom.xml
View file @ e42d9550
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>org.igniterealtime.openfire.plugins</groupId> <groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>inverse</artifactId> <artifactId>inverse</artifactId>
<name>Inverse Webchat Plugin</name> <name>Inverse Webchat Plugin</name>
<version>3.3.2-release-1</version> <version>3.3.4-release-1</version>
<build> <build>
<sourceDirectory>src/java</sourceDirectory> <sourceDirectory>src/java</sourceDirectory>
......
src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/ConfigServlet.java
View file @ e42d9550
...@@ -51,7 +51,7 @@ public class ConfigServlet extends HttpServlet ...@@ -51,7 +51,7 @@ public class ConfigServlet extends HttpServlet
final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false ); final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false );
final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/"; final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/";
final boolean debug = JiveGlobals.getBooleanProperty( "inverse.config.debug", false ); final boolean debug = JiveGlobals.getBooleanProperty( "inverse.config.debug", false );
final String viewMode = JiveGlobals.getProperty( "inverse.config.view_mode" ); //final String viewMode = JiveGlobals.getProperty( "inverse.config.view_mode" );
// The language of the inVerse UI. // The language of the inVerse UI.
final Language language = InversePlugin.getLanguage(); final Language language = InversePlugin.getLanguage();
...@@ -77,10 +77,11 @@ public class ConfigServlet extends HttpServlet ...@@ -77,10 +77,11 @@ public class ConfigServlet extends HttpServlet
config.put( "domain_placeholder", defaultDomain ); config.put( "domain_placeholder", defaultDomain );
config.put( "bosh_service_url", endpoint ); config.put( "bosh_service_url", endpoint );
config.put( "debug", debug ); config.put( "debug", debug );
if ( viewMode != null && !viewMode.isEmpty() ) config.put( "view_mode", "fullscreen" );
{ // if ( viewMode != null && !viewMode.isEmpty() )
config.put( "view_mode", viewMode ); // {
} // config.put( "view_mode", viewMode );
// }
final JSONArray whitelistedPlugins = new JSONArray(); // TODO make configurable. final JSONArray whitelistedPlugins = new JSONArray(); // TODO make configurable.
whitelistedPlugins.put( "converse-singleton" ); whitelistedPlugins.put( "converse-singleton" );
......
src/plugins/inverse/src/web/inverse-config.jsp
View file @ e42d9550
...@@ -226,35 +226,35 @@ ...@@ -226,35 +226,35 @@
</label> </label>
</td> </td>
</tr> </tr>
<tr valign="top"> <%--<tr valign="top">--%>
<td colspan="2" style="padding-top: 1em;"> <%--<td colspan="2" style="padding-top: 1em;">--%>
<b><fmt:message key="config.page.view_mode.label"/></b> - <fmt:message key="config.page.view_mode.description"/> <%--<b><fmt:message key="config.page.view_mode.label"/></b> - <fmt:message key="config.page.view_mode.description"/>--%>
</td> <%--</td>--%>
</tr> <%--</tr>--%>
<tr valign="top"> <%--<tr valign="top">--%>
<td colspan="2"> <%--<td colspan="2">--%>
<input type="radio" name="view_mode" id="overlayed" value="overlayed" <%= "overlayed".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp; <%--<input type="radio" name="view_mode" id="overlayed" value="overlayed" <%= "overlayed".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;--%>
<label for="overlayed"> <%--<label for="overlayed">--%>
<fmt:message key="config.page.view_mode.overlayed.label"/> <%--<fmt:message key="config.page.view_mode.overlayed.label"/>--%>
</label> <%--</label>--%>
</td> <%--</td>--%>
</tr> <%--</tr>--%>
<tr valign="top"> <%--<tr valign="top">--%>
<td colspan="2"> <%--<td colspan="2">--%>
<input type="radio" name="view_mode" id="fullscreen" value="fullscreen" <%= "fullscreen".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp; <%--<input type="radio" name="view_mode" id="fullscreen" value="fullscreen" <%= "fullscreen".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;--%>
<label for="fullscreen"> <%--<label for="fullscreen">--%>
<fmt:message key="config.page.view_mode.fullscreen.label"/> <%--<fmt:message key="config.page.view_mode.fullscreen.label"/>--%>
</label> <%--</label>--%>
</td> <%--</td>--%>
</tr> <%--</tr>--%>
<tr valign="top"> <%--<tr valign="top">--%>
<td colspan="2"> <%--<td colspan="2">--%>
<input type="radio" name="view_mode" id="mobile" value="mobile" <%= "mobile".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp; <%--<input type="radio" name="view_mode" id="mobile" value="mobile" <%= "mobile".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;--%>
<label for="mobile"> <%--<label for="mobile">--%>
<fmt:message key="config.page.view_mode.mobile.label"/> <%--<fmt:message key="config.page.view_mode.mobile.label"/>--%>
</label> <%--</label>--%>
</td> <%--</td>--%>
</tr> <%--</tr>--%>
</tbody> </tbody>
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023