- update libraries
- activate websocket
- copy resources form client
- correct image static location (from static_url)
--- a/.classpath Wed Feb 13 13:41:19 2013 +0100
+++ b/.classpath Thu Feb 14 01:20:14 2013 +0100
@@ -9,29 +9,29 @@
<classpathentry kind="var" path="M2_REPO/org/opencoweb/coweb-operationengine/1.0/coweb-operationengine-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/cometd/java/bayeux-api/2.5.0/bayeux-api-2.5.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/cometd/java/cometd-java-common/2.5.0/cometd-java-common-2.5.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.6.7.v20120910/jetty-util-7.6.7.v20120910.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.0.0.RC0/jetty-util-9.0.0.RC0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.6.7.v20120910/jetty-continuation-7.6.7.v20120910.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jmx/7.6.7.v20120910/jetty-jmx-7.6.7.v20120910.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.16/jersey-server-1.16.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.16/jersey-core-1.16.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mongodb/mongo-java-driver/2.9.0/mongo-java-driver-2.9.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.1.3.RELEASE/spring-context-3.1.3.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/8.1.8.v20121106/jetty-continuation-8.1.8.v20121106.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jmx/9.0.0.RC0/jetty-jmx-9.0.0.RC0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.17/jersey-server-1.17.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.17/jersey-core-1.17.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mongodb/mongo-java-driver/2.10.1/mongo-java-driver-2.10.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.jar"/>
<classpathentry kind="var" path="M2_REPO"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.1.3.RELEASE/spring-beans-3.1.3.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.1.RELEASE/spring-beans-3.2.1.RELEASE.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-mongodb/1.1.0.RELEASE/spring-data-mongodb-1.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-commons-core/1.4.0.RELEASE/spring-data-commons-core-1.4.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-jpa/1.2.0.RELEASE/spring-data-jpa-1.2.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-mongodb/1.1.1.RELEASE/spring-data-mongodb-1.1.1.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-commons-core/1.4.1.RELEASE/spring-data-commons-core-1.4.1.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/data/spring-data-jpa/1.3.0.RELEASE/spring-data-jpa-1.3.0.RELEASE.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/cometd/java/cometd-java-annotations/2.5.0/cometd-java-annotations-2.5.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/cometd/java/cometd-java-server/2.5.0/cometd-java-server-2.5.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.1.3.RELEASE/spring-core-3.1.3.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.1.3.RELEASE/spring-web-3.1.3.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.1.3.RELEASE/spring-webmvc-3.1.3.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.1.RELEASE/spring-core-3.2.1.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.1.RELEASE/spring-web-3.2.1.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.2.1.RELEASE/spring-webmvc-3.2.1.RELEASE.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.1.3.RELEASE/spring-test-3.1.3.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.2/jstl-1.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
@@ -48,5 +48,7 @@
</classpathentry>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.1.2/jackson-core-2.1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.1.2/jackson-databind-2.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/cometd/java/cometd-websocket-jetty/2.5.1/cometd-websocket-jetty-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-websocket/8.1.9.v20130131/jetty-websocket-8.1.9.v20130131.jar"/>
<classpathentry kind="output" path="server/target/classes"/>
</classpath>
--- a/client/js/ldtjson-bin.js Wed Feb 13 13:41:19 2013 +0100
+++ b/client/js/ldtjson-bin.js Thu Feb 14 01:20:14 2013 +0100
@@ -3,8 +3,8 @@
Rkns.Ldt.ProjectBin = Rkns.Utils.inherit(Rkns._BaseBin);
Rkns.Ldt.ProjectBin.prototype.tagTemplate = Rkns._.template(
- '<li class="Rk-Bin-Item" data-image="img/ldt-tag.png" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" data-title="<%-title%>" data-description="Tag \'<%-title%>\'">'
- + '<img class="Rk-Ldt-Tag-Icon" src="img/ldt-tag.png" /><h4><%=htitle%></h4><div class="Rk-Clear"></div></li>'
+ '<li class="Rk-Bin-Item" data-image="<%-static_url%>img/ldt-tag.png" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" data-title="<%-title%>" data-description="Tag \'<%-title%>\'">'
+ + '<img class="Rk-Ldt-Tag-Icon" src="<%-static_url%>img/ldt-tag.png" /><h4><%=htitle%></h4><div class="Rk-Clear"></div></li>'
);
Rkns.Ldt.ProjectBin.prototype.annotationTemplate = Rkns._.template(
@@ -63,7 +63,8 @@
ldt_platform: _this.ldt_platform,
title: _title,
htitle: highlight(_title),
- encodedtitle : encodeURIComponent(_title)
+ encodedtitle : encodeURIComponent(_title),
+ static_url: _this.renkan.static_url
})
});
_html += '<li><h3>Annotations</h3></li>';
@@ -78,7 +79,7 @@
_img = (
(_annotation.content && _annotation.content.img && _annotation.content.img.src)
? _annotation.content.img.src
- : ( _duration ? "img/ldt-segment.png" : "img/ldt-point.png" )
+ : ( _duration ? _this.renkan.static_url+"img/ldt-segment.png" : _this.renkan.static_url+"img/ldt-point.png" )
);
_html += _this.annotationTemplate({
ldt_platform: _this.ldt_platform,
@@ -91,7 +92,8 @@
duration: convertTC(_duration),
mediaid: _annotation.media,
annotationid: _annotation.id,
- image: _img
+ image: _img,
+ static_url: _this.renkan.static_url
});
});
--- a/server/pom.xml Wed Feb 13 13:41:19 2013 +0100
+++ b/server/pom.xml Thu Feb 14 01:20:14 2013 +0100
@@ -9,13 +9,14 @@
<properties>
<coweb-version>1.0</coweb-version>
- <cowebx-version>0.8.4</cowebx-version>
- <jersey-version>1.16</jersey-version>
- <spring-version>3.1.3.RELEASE</spring-version>
- <!--jetty-version>9.0.0.M4</jetty-version-->
- <jetty-version>8.1.8.v20121106</jetty-version>
+ <cowebx-version>1.0</cowebx-version>
+ <jersey-version>1.17</jersey-version>
+ <spring-version>3.2.1.RELEASE</spring-version>
+ <!--jetty-version>9.0.0.RC0</jetty-version-->
+ <jetty-version>8.1.9.v20130131</jetty-version>
<junit-version>4.10</junit-version>
- <thymeleaf-version>2.0.14</thymeleaf-version>
+ <thymeleaf-version>2.0.15</thymeleaf-version>
+ <cometd-version>2.5.1</cometd-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -25,10 +26,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
@@ -38,15 +39,15 @@
<version>${jetty-version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
- <webAppConfig>
+ <webApp>
<contextPath>/renkan</contextPath>
- </webAppConfig>
+ </webApp>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.3</version>
<configuration>
<overlays>
<overlay>
@@ -70,11 +71,35 @@
<targetPath>lib/cowebx/dojo</targetPath>
</overlay>
</overlays>
+ <webResources>
+ <resource>
+ <directory>../client/js</directory>
+ <includes>
+ <include>i18n.js</include>
+ <include>*-bin.js</include>
+ <include>models.js</include>
+ <include>paper-renderer.js</include>
+ <include>main.js</include>
+ </includes>
+ <targetPath>static/js</targetPath>
+ </resource>
+ <resource>
+ <directory>../client/css</directory>
+ <includes>
+ <include>*.css</include>
+ </includes>
+ <targetPath>static/css</targetPath>
+ </resource>
+ <resource>
+ <directory>../client/img</directory>
+ <targetPath>static/img</targetPath>
+ </resource>
+ </webResources>
</configuration>
</plugin>
</plugins>
</build>
- <repositories>
+ <repositories>
<repository>
<id>spring-maven-release</id>
<name>Spring Maven Release Repository</name>
@@ -85,6 +110,11 @@
<name>Spring Maven MILESTONE Repository</name>
<url>http://maven.springframework.org/milestone</url>
</repository>
+ <repository>
+ <id>spring-release</id>
+ <name>Spring Maven SNAPSHOT Repository</name>
+ <url>http://repo.springsource.org/release</url>
+ </repository>
</repositories>
<dependencies>
<dependency>
@@ -94,14 +124,24 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
+ <artifactId>cometd-java-common</artifactId>
+ <version>${cometd-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cometd.java</groupId>
<artifactId>cometd-java-annotations</artifactId>
- <version>2.5.0</version>
- </dependency>
+ <version>${cometd-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cometd.java</groupId>
+ <artifactId>cometd-websocket-jetty</artifactId>
+ <version>${cometd-version}</version>
+ </dependency>
<dependency>
<groupId>org.opencoweb</groupId>
<artifactId>coweb-bots</artifactId>
@@ -159,7 +199,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.9.0</version>
+ <version>2.10.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -219,7 +259,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
- <version>1.1.0.RELEASE</version>
+ <version>1.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
@@ -263,6 +303,31 @@
<artifactId>commons-codec</artifactId>
<version>1.7</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-websocket</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
</dependencies>
<organization>
<name>IRI</name>
--- a/server/src/main/java/org/iri_research/renkan/coweb/SpringConfigurer.java Wed Feb 13 13:41:19 2013 +0100
+++ b/server/src/main/java/org/iri_research/renkan/coweb/SpringConfigurer.java Thu Feb 14 01:20:14 2013 +0100
@@ -10,6 +10,7 @@
import org.cometd.annotation.ServerAnnotationProcessor;
import org.cometd.bayeux.server.BayeuxServer;
import org.cometd.server.BayeuxServerImpl;
+import org.cometd.websocket.server.WebSocketTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -81,8 +82,9 @@
public BayeuxServer bayeuxServer()
{
BayeuxServerImpl bean = new BayeuxServerImpl();
+ bean.addTransport(new WebSocketTransport(bean));
Map<String, Object> options = new HashMap<String, Object>();
- options.put(BayeuxServerImpl.LOG_LEVEL, "3");
+ options.put(BayeuxServerImpl.LOG_LEVEL, "1");
options.put("timeout", "1500");
bean.setOptions(options);
return bean;
--- a/server/src/main/resources/log4j.xml Wed Feb 13 13:41:19 2013 +0100
+++ b/server/src/main/resources/log4j.xml Thu Feb 14 01:20:14 2013 +0100
@@ -17,6 +17,9 @@
<logger name="org.springframework.beans.factory">
<level value="DEBUG" />
</logger>
+ <!--logger name="org.cometd">
+ <level value="DEBUG" />
+ </logger-->
<root>
<priority value ="WARN" />
<appender-ref ref="console" />
--- a/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Wed Feb 13 13:41:19 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Thu Feb 14 01:20:14 2013 +0100
@@ -16,7 +16,6 @@
<script src="js/main.js" th:src="@{/static/js/main.js}"></script>
<script src="js/i18n.js" th:src="@{/static/js/i18n.js}"></script>
<script src="js/models.js" th:src="@{/static/js/models.js}"></script>
- <script src="js/corenkan-json.js" th:src="@{/static/js/corenkan-json.js}"></script>
<script src="js/twitter-bin.js" th:src="@{/static/js/twitter-bin.js}"></script>
<script src="js/wikipedia-bin.js" th:src="@{/static/js/wikipedia-bin.js}"></script>
<script src="js/ldtjson-bin.js" th:src="@{/static/js/ldtjson-bin.js}"></script>
@@ -77,12 +76,6 @@
corenkan.app.onStatusChange = function(status) {
if(status == "ready") {
_renkan.renderer.autoScale();
- /*Rkns.jsonIO(_renkan, {*/
- /*url: *//*[[@{/rest/projects/}+${project.id}]]*/ /*"data/simple-persist.php",*/
- //callback: function(_proj, _renkan) {
- // corenkan.app.setObjects(_renkan);
- // }
- //});
}
};
});
--- a/server/src/main/webapp/WEB-INF/web.xml Wed Feb 13 13:41:19 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/web.xml Thu Feb 14 01:20:14 2013 +0100
@@ -21,7 +21,7 @@
<servlet-class>org.iri_research.renkan.coweb.server.RenkanCometdServlet</servlet-class>
<init-param>
<param-name>logLevel</param-name>
- <param-value>0</param-value>
+ <param-value>2</param-value>
</init-param>
<init-param>
<param-name>timeout</param-name>
@@ -35,10 +35,10 @@
<param-name>maxSessionsPerBrowser</param-name>
<param-value>-1</param-value>
</init-param>
- <!--init-param>
+ <init-param>
<param-name>transports</param-name>
<param-value>org.cometd.websocket.server.WebSocketTransport</param-value>
- </init-param-->
+ </init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
--- a/server/src/main/webapp/static/css/renkan-publish.css Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-
-ul, li {
- list-style: none;
-}
-
-input::-moz-focus-inner /*Remove button padding in FF*/
-{
- border: 0;
- padding: 0;
-}
-
-table {
- border-collapse: separate; border-spacing: 0;
-}
-
-th, td {
- vertical-align: top;
-}
-
-img a {
- border: none;
-}
-
-body {
- font-size: 10px; font-family: Arial, Helvetica, sans-serif;
- background: #ffffff; color: #000000;
-}
-
-a {
- color: #303080;
-}
-
-.Rk-ProjectList {
- position: absolute; left: 0; top: 0; list-style: none; padding: 0; margin: 0;
-}
-
-.Rk-Project {
- list-style: none; margin-right: 5px; padding: 5px; height: 15px; font-size: 13px; font-weight: bold;
- float: left; border-top-left-radius: 8px; border-top-right-radius: 8px;
- background: #505050; color: #E0E0E0; cursor: pointer;
- background: -moz-linear-gradient(top, #333333 20%, #666666 80%);
-}
-
-.Rk-Project:hover {
- background: -moz-linear-gradient(bottom, #333333 20%, #666666 80%);
-}
-
-.Rk-Project.active {
- background: #505080;
- color: #ffffc0;
- background: -moz-linear-gradient(bottom, #333366 20%, #666699 80%);
-}
-
-.Rk-Render {
- position: absolute; left: 0; top: 25px; right: 0; bottom: 0;
- background: -moz-linear-gradient(top, rgba(180,180,180,.2) 0, rgba(255,255,255,.2) 30%, rgba(255,255,255,.2) 70%, rgba(180,180,180,.2) 100%);
-}
-
-.Rk-Canvas {
- background: -moz-linear-gradient(left, rgba(180,180,180,.2) 0, rgba(255,255,255,.2) 30%, rgba(255,255,255,.2) 70%, rgba(180,180,180,.2) 100%);
- position: absolute; left: 0; top: 0; right: 0; bottom: 0;
-}
-
-.Rk-Editor {
- position: absolute; left: 0; top: 0;
-}
-
-.Rk-CloseX {
- float: right; cursor: pointer;
-}
-
-.Rk-Editor h2 {
- font-size: 14px; font-weight: bold;
-}
-
-.Rk-Editor p {
- margin: 5px 0; font-size: 11px;
-}
-
-.Rk-RelatedList {
- list-style: none;
-}
-
-.Rk-Related {
- color: #a000c0; cursor: pointer; margin: 5px 0;
-}
-
-.Rk-Related b {
- font-weight: bolder;
-}
-
-.Rk-Related:hover {
- text-decoration: underline;
-}
-
-.Rk-ZoomButtons {
- position: absolute; left: 0; top: 0; cursor: pointer;
-}
-
-.Rk-ZoomIn, .Rk-ZoomOut {
- width: 21px; height: 20px; background: url(../img/zoombuttons.png); margin: 5px;
-}
-
-.Rk-ZoomIn:hover {
- background-position: 0 -20px;
-}
-
-.Rk-ZoomOut {
- background-position: -21px 0;
-}
-
-.Rk-ZoomOut:hover {
- background-position: -21px -20px;
-}
--- a/server/src/main/webapp/static/css/renkan.css Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-
-ul, li {
- list-style: none;
-}
-
-input::-moz-focus-inner /*Remove button padding in FF*/
-{
- border: 0;
- padding: 0;
-}
-
-table {
- border-collapse: separate; border-spacing: 0;
-}
-
-th, td {
- vertical-align: top;
-}
-
-img a {
- border: none;
-}
-
-body {
- font-size: 10px; font-family: Arial, Helvetica, sans-serif;
- background: #ffffff; color: #000000;
-}
-
-a {
- color: #6060c0;
-}
-
-.Rk-Main {
- position: absolute; left: 0; top: 0; right: 0; bottom: 0;
-}
-
-.Rk-Render {
- position: absolute; left: 300px; top: 0; right: 0; bottom: 0;
- background: #ffffff;
- background: -moz-linear-gradient(left, #f3f3f3 0, #ffffff 30%, #ffffff 70%, #f3f3f3 100%);
- background: -webkit-linear-gradient(left, #f3f3f3 0, #ffffff 30%, #ffffff 70%, #f3f3f3 100%);
-}
-
-/* Top Bar */
-
-.Rk-TopBar {
- position: absolute; left: 0; top: 0; right: 0; height: 35px;
- background: #333333;
- background: -moz-linear-gradient(top, #505050 5px, #1e1e1e 30px);
- background: -webkit-linear-gradient(top, #505050 5px, #1e1e1e 30px);
-}
-
-.Rk-PadTitle {
- float: left; font-size: 14px; height: 16px; margin: 4px 5px; width: 200px; background: #666666; padding: 4px; border: 1px solid #333333;
- border-radius: 3px; box-shadow: 0 1px 0 #505050; color: #ffffff; font-weight: bold;
-}
-
-.Rk-Users {
- float: right; width: 130px; margin: 4px 5px;
-}
-
-.Rk-CurrentUser {
- font-size: 13px; background: #666666; padding: 4px; border: 1px solid #333333; border-radius: 3px; box-shadow: 0 1px 0 #505050; color: #ffffff;
-}
-
-.Rk-CurrentUser-Color {
- display: inline-block; width: 12px; height: 12px; border: 1px solid #333333; margin: -2px 2px;
-}
-
-.Rk-UserList {
- box-shadow: 0 2px 2px #999999;
- position: relative; z-index: 3; display: none; padding-top: 8px;
-}
-
-.Rk-User {
- background: #ffffff; padding: 3px; font-size: 12px; border-style: solid solid none; border-color: #cccccc; border-width: 1px;
-}
-
-.Rk-TopBar-Button {
- float: right; background: url(../img/topbarbuttons.png) no-repeat; height: 35px; cursor: pointer;
- position: relative;
-}
-
-.Rk-TopBar-Separator {
- background: #666666;
- background: -moz-linear-gradient(top, #666666 20%, #333333 80%);
- background: -webkit-linear-gradient(top, #666666 20%, #333333 80%);
- content: ""; display: block; height: 35px; float: right; width: 1px; border-left: 1px solid #111111;
- margin: 0 3px;
-}
-
-.Rk-TopBar-Tooltip {
- position: absolute; top: 31px; left: 50%; margin-left: -60px; width: 120px; z-index: 3; display: none;
-}
-
-.Rk-TopBar-Tooltip-Contents {
- background: #ffffff;
- font-size: 13px; font-weight: bold; color: #6060c0; text-align: center; padding: 2px;
- border-style: none solid solid; border-width: 1px; border-color: #cccccc; border-bottom-left-radius: 2px; border-bottom-right-radius: 2px;
-}
-
-.Rk-TopBar-Tooltip-Tip {
- height: 7px; background: url(../img/tooltiparrow.png) center no-repeat; margin: 0 1px;
-}
-
-.Rk-AddNode-Button {
- width: 34px;
-}
-
-.Rk-AddNode-Button:hover {
- background-position: 0 -35px;
-}
-
-.Rk-FullScreen-Button {
- width: 34px; background-position: -34px 0;
-}
-
-.Rk-FullScreen-Button:hover {
- background-position: -34px -35px;
-}
-
-.Rk-AddEdge-Button {
- width: 34px; background-position: -68px 0;
-}
-
-.Rk-AddEdge-Button:hover {
- background-position: -68px -35px;
-}
-
-.Rk-Save-Button {
- width: 34px; background-position: -102px 0;
-}
-
-.Rk-Save-Button.disabled {
- opacity: .5; cursor: default;
-}
-
-.Rk-Save-Button:hover {
- background-position: -102px -35px;
-}
-
-.Rk-Save-Button.disabled:hover {
- opacity: 1; background-position: -102px 0;
-}
-/* Canvas */
-
-.Rk-Canvas {
- background: -moz-linear-gradient(top, rgba(180,180,180,.2) 0, rgba(255,255,255,.2) 30%, rgba(255,255,255,.2) 70%, rgba(180,180,180,.2) 100%);
- background: -webkit-linear-gradient(top, rgba(180,180,180,.2) 0, rgba(255,255,255,.2) 30%, rgba(255,255,255,.2) 70%, rgba(180,180,180,.2) 100%);
- position: absolute; left: 0; top: 35px; right: 0; bottom: 0; z-index: 1;
-}
-
-/* Editors */
-
-.Rk-Editor {
- position: absolute; left: 0; top: 35px; right: 0; z-index: 2;
-}
-
-.Rk-Notifications {
- position: absolute; right: 15px; top: 15px; width: 200px;
- padding: 10px; border-radius: 8px; display: none;
- color: #ffffff; font-size: 13px; text-align: center; font-weight: bold;
- background: rgba(20,20,20,.7);
- background: -moz-linear-gradient(top, rgba(40,40,40,.7) 20%, rgba(0,0,0,.7) 80%);
- background: -webkit-linear-gradient(top, rgba(40,40,40,.7) 20%, rgba(0,0,0,.7) 80%);
-}
-
-.Rk-CloseX {
- float: right; cursor: pointer;
-}
-
-.Rk-Editor h2 {
- font-size: 16px; font-weight: bold;
-}
-
-.Rk-Editor p {
- margin: 5px 0; font-size: 12px;
-}
-
-.Rk-Editor label {
- display: inline-block; width: 70px;
-}
-
-a.Rk-Edit-Goto {
- display: block; float: right; width: 18px; height: 17px; margin: 1px 0; border: none; background: url(../img/goto.png);
-}
-
-.Rk-Edit-Title, .Rk-Edit-URI, .Rk-Edit-Image {
- font-size: 12px; width: 225px;
-}
-
-.Rk-Edit-URI {
- font-size: 12px; width: 205px;
-}
-
-.Rk-Edit-ImgPreview {
- border: 1px solid #666; margin: 5px 0; min-height: 10px; display: block;
- max-width: 100% !important; max-height: 100px !important;
-}
-
-.Rk-Editor textarea {
- width: 225px; height: 120px; resize: none;
-}
-
-.Rk-UserColor {
- display: inline-block; width: 1em; height: 1em; border: 1px solid #666666; margin: -2px 2px;
-}
-
-.Rk-ZoomButtons {
- position: absolute; left: 0; top: 0; cursor: pointer;
-}
-
-.Rk-ZoomIn, .Rk-ZoomOut {
- width: 21px; height: 20px; background: url(../img/zoombuttons.png); margin: 5px;
-}
-
-.Rk-ZoomIn:hover {
- background-position: 0 -20px;
-}
-
-.Rk-ZoomOut {
- background-position: -21px 0;
-}
-
-.Rk-ZoomOut:hover {
- background-position: -21px -20px;
-}
-
-/* Bins */
-
-.Rk-Title {
- position: absolute; left: 0; top: 0; width: 300px; height: 35px;
- background: #333333;
- background: -moz-linear-gradient(top, #505050 5px, #1e1e1e 30px);
- background: -webkit-linear-gradient(top, #505050 5px, #1e1e1e 30px);
-}
-
-.Rk-Title h1 {
- font-size: 18px; color: #ffffff; margin: 5px;
-}
-
-
-.Rk-Title:after {
- background: #666666;
- background: -moz-linear-gradient(top, #666666 20%, #333333 80%);
- background: -webkit-linear-gradient(top, #666666 20%, #333333 80%);
- content: ""; display: block; height: 35px;
- left: 298px; position: absolute; top: 0; width: 1px; border-left: 1px solid #111111;
-}
-
-.Rk-Bins {
- background: #ffffff; position: absolute; left: 0; top: 35px; width: 299px; bottom: 0;
- overflow: hidden; border-right: 1px solid #252525;
-}
-
-/* Bin Search Field */
-
-.Rk-Search-Form {
- padding: 5px 10px; height: 27px;
- background: #666666;
- background: -moz-linear-gradient(top, #606060 20%, #909090 80%);
- background: -webkit-linear-gradient(top, #606060 20%, #909090 80%);
-}
-
-.Rk-Search-Input, .Rk-Search-Select {
- float: left; margin: 0;
-}
-
-.Rk-Search-Input {
- border-top-left-radius: 5px; border-bottom-left-radius: 5px; border: 1px solid #003050;
- font-size: 13px; background: #ffffff; height: 25px; padding: 0 5px; line-height: 25px;
- -webkit-appearance: none;
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-
-.Rk-Web-Search-Input {
- width: 190px;
-}
-
-.Rk-Bins-Search-Input {
- width: 235px;
-}
-
-.Rk-Search-Select {
- display: inline-block; position: relative; width: 45px;
- border-width: 1px; border-color: #003050; border-style: solid none; cursor: pointer;
- height: 25px; background: #ffffff url(../img/more.png) 30px 10px no-repeat;
-}
-
-.Rk-Search-Select:hover {
- background-color: #3030FF;
-}
-
-.Rk-Search-Current {
- width: 40px; height: 20px; margin: 2px; background-repeat: no-repeat;
-}
-
-.Rk-Search-List {
- width: 180px; margin-left: 15px; font-size: 13px;
- position: absolute; right: 0; top: 25px; background: #ffffff;
- box-shadow: 1px 1px 2px #505050; display: none;
- border: 1px solid #cccccc;
-}
-
-.Rk-Search-List li {
- padding: 2px 2px 2px 30px; border-top: 1px solid #cccccc; height: 16px;
- background-color: #ffffff; background-repeat: no-repeat; cursor: pointer;
-}
-
-.Rk-Search-List li:hover {
- background-color: #3030ff; color: #ffffff;
-}
-
-.Rk-Search-Submit {
- border: 1px solid #003050; height: 27px; width: 30px; border-top-right-radius: 5px; border-bottom-right-radius: 5px;
- background: #333333 center no-repeat url(../img/search.png); cursor: pointer;
-}
-
-.Rk-Search-Submit:hover {
- background-color: #999999;
-}
-
-/* Individual Bins */
-
-
-.Rk-Bin-Title {
- background: #333333;
- background: -moz-linear-gradient(top, #505050 20%, #1e1e1e 80%);
- background: -webkit-linear-gradient(top, #505050 20%, #1e1e1e 80%);
- border-bottom: 1px solid #666666; font-weight: bold;
- font-size: 14px; padding: 5px 5px 5px 30px; cursor: pointer; color: #f0f0f0;
-}
-
-.Rk-Bin-Close {
- float: right; display: block; font-size: 16px; font-weight: bold; margin: 2px 3px 0; color: #f0f0f0; cursor: pointer;
- text-shadow: -1px -1px 1px #999999, 1px 1px 1px #000000; text-decoration: none;
-}
-
-.Rk-Bin-Close:hover {
- color: #ffff80;
-}
-
-.Rk-Bin-Title:hover {
- color: #ffffe0;
- background: -moz-linear-gradient(top, rgb(20,20,20) 20%, rgb(60,60,60) 80%);
- background: -webkit-linear-gradient(top, rgb(20,20,20) 20%, rgb(60,60,60) 80%);
-}
-
-.Rk-Bin-Refresh {
- width: 18px; height: 17px; background: url(../img/refresh.png); display: block; float: right; margin-top: 4px;
-}
-
-.Rk-Bin-Refresh:hover {
- background-position: -18px 0;
-}
-
-.Rk-Bin-Count {
- float: right; background: #c000a0; color: #FFFFFF; text-shadow: 1px 1px 1px #000000; display: none;
- border-radius: 4px; padding: 1px 3px; font-size: 10px; font-weight: bold; margin-top: 4px;
-}
-
-.Rk-Bin-Title-Icon {
- float: left; width: 25px; margin: 2px;
-}
-
-.Rk-Bin-Main {
- overflow: auto;
- background: #ffffff;
- background: -moz-linear-gradient(top, #e0e0e0 0, #FFFFFF 2%, #FFFFFF 98%, #e0e0e0 100%);
- background: -webkit-linear-gradient(top, #e0e0e0 0, #FFFFFF 2%, #FFFFFF 98%, #e0e0e0 100%);
-}
-
-.Rk-Bin-Item {
- cursor: move;
-}
-
-.Rk-Bin-Item:hover {
- background: -moz-linear-gradient(top, rgba(0,0,0,.1) 20%, rgba(128,128,128,.1) 80%);
- background: -webkit-linear-gradient(top, rgba(0,0,0,.1) 20%, rgba(128,128,128,.1) 80%);
-}
-
-.Rk-Bin-Item.dragging {
- background: -moz-linear-gradient(top, rgba(128,0,0,.1) 20%, rgba(255,128,128,.1) 80%);
- background: -webkit-linear-gradient(top, rgba(128,0,0,.1) 20%, rgba(255,128,128,.1) 80%);
- color: #660000;
-}
-
-.Rk-Bin-Item.selected {
- background: #ffffc0;
-}
-
-.Rk-Bin-Main li {
- padding: 2px; border-bottom: 1px solid #cccccc;
- clear: both;
-}
-
-.Rk-Bin-Main h3 {
- font-size: 14px; font-style: italic; font-weight: bold; text-align: center;
-}
-
-.Rk-Bin-Main h4 {
- font-size: 12px; font-weight: bold;
-}
-
-.Rk-Bin-Main p {
- font-size: 11px;
-}
-
-.Rk-Twitter-Icon {
- background-image: url(../img/search-logos.png); background-position: 0 -80px;
-}
-
-.Rk-Twitter-Title-Icon {
- height: 20px; background: url(../img/search-logos.png); background-position: 0 -80px;
-}
-
-.Rk-Twitter-TwImage {
- float: left; width: 48px; height: 48px; margin: 2px 0;
-}
-
-.Rk-Twitter-TwTitle, .Rk-Twitter-TwDate, .Rk-Twitter-TwText, .Rk-Twitter-TwActions {
- margin: 2px 0 2px 50px;
-}
-
-p.Rk-Twitter-TwDate {
- font-size: 11px; font-style: italic;
-}
-
-p.Rk-Twitter-TwActions {
- font-size: 11px;
-}
-
-.Rk-Bin-Main .searchmatch {
- background: #ffff80;
-}
-
-.Rk-Wikipedia-Search-Icon {
- background-image: url(../img/search-logos.png);
-}
-
-.Rk-Wikipedia-Icon {
- float: left; margin: 3px;
-}
-
-.Rk-Wikipedia-Title-Icon {
- height: 20px; background: url(../img/search-logos.png);
-}
-
-.Rk-Wikipedia-Lang-en {
- background-position: 0 -20px;
-}
-
-.Rk-Wikipedia-Lang-fr {
- background-position: 0 -40px;
-}
-
-.Rk-Wikipedia-Lang-ja {
- background-position: 0 -60px;
-}
-
-.Rk-Wikipedia-Result {
- min-height: 51px;
-}
-
-.Rk-Wikipedia-Result p, .Rk-Wikipedia-Result h4 {
- margin-left: 54px;
-}
-
-.Rk-Ldt-Tag-Icon {
- float: left; margin: 0 2px 0 0;
-}
-
-.Rk-Ldt-Annotation-Icon {
- float: left; margin: 3px;
-}
-
-.Rk-Clear {
- clear: both;
-}
Binary file server/src/main/webapp/static/img/edit.png has changed
Binary file server/src/main/webapp/static/img/goto.png has changed
Binary file server/src/main/webapp/static/img/ldt-point.png has changed
Binary file server/src/main/webapp/static/img/ldt-segment.png has changed
Binary file server/src/main/webapp/static/img/ldt-tag.png has changed
Binary file server/src/main/webapp/static/img/link.png has changed
Binary file server/src/main/webapp/static/img/more.png has changed
Binary file server/src/main/webapp/static/img/refresh.png has changed
Binary file server/src/main/webapp/static/img/remove.png has changed
Binary file server/src/main/webapp/static/img/search-logos.png has changed
Binary file server/src/main/webapp/static/img/search.png has changed
Binary file server/src/main/webapp/static/img/tooltiparrow.png has changed
Binary file server/src/main/webapp/static/img/topbarbuttons.png has changed
Binary file server/src/main/webapp/static/img/wikipedia.png has changed
Binary file server/src/main/webapp/static/img/zoombuttons.png has changed
--- a/server/src/main/webapp/static/js/config.js Wed Feb 13 13:41:19 2013 +0100
+++ b/server/src/main/webapp/static/js/config.js Thu Feb 14 01:20:14 2013 +0100
@@ -5,7 +5,7 @@
// Copyright (c) The Dojo Foundation 2011. All Rights Reserved.
//
var dojoConfig = {
- baseUrl: '/', /* WAS /renkan */
+ baseUrl: '/renkan/',
async:true,
paths : {
coweb : 'lib/coweb',
@@ -20,22 +20,12 @@
location:'static/lib/dojo',
main:'main'
}],
- /*{
- name: 'dijit',
- location:'lib/dijit',
- main:'main'
- },
- {
- name: 'dojox',
- location:'lib/dojox',
- main:'main'
- }]*/
};
var cowebConfig = {
baseUrl: window.location.protocol + '//' +window.location.host,
- adminUrl : '/admin',
+ adminUrl : dojoConfig.baseUrl+'admin',
debug: false,
- //useWebSockets: true
+ useWebSockets: true
};
--- a/server/src/main/webapp/static/js/corenkan-json.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-
-Rkns.jsonIO = function(_renkan, _opts) {
- /*var _proj = _renkan.project;
- if (typeof _opts.http_method == "undefined") {
- _opts.http_method = 'PUT';
- }
- var _load = function() {
- Rkns.$.getJSON(_opts.url, function(_data) {
- _data['_id'] = _data['id'];
- _proj.set(_data, {silent: true});
- _renkan.renderer.autoScale();
- if(typeof _opts.callback !== "undefined") {
- console.log("Corenkan json: project loaded, calling callback for project id " + _proj.id, _data, _proj);
- _opts.callback(_proj, _renkan);
- }
- });
- };
- _load();*/
-};
--- a/server/src/main/webapp/static/js/full-json.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* Saves the Full JSON at each modification */
-
-
-Rkns.jsonIO = function(_renkan, _opts) {
- var _proj = _renkan.project;
- if (typeof _opts.http_method == "undefined") {
- _opts.http_method = 'PUT';
- }
- var _load = function() {
- Rkns.$.getJSON(_opts.url, function(_data) {
- _proj.set(_data);
- _renkan.renderer.autoScale();
- });
- }
- var _save = function() {
- var _data = _proj.toJSON();
- Rkns.$.ajax({
- type: _opts.http_method,
- url: _opts.url,
- contentType: "application/json",
- data: JSON.stringify(_data),
- success: function(data, textStatus, jqXHR) {
- }
- });
-
- }
- var _thrSave = Rkns._.throttle(
- function() {
- setTimeout(_save, 100)
- }, 1000);
- _load();
- _proj.on("add:nodes add:edges add:users", function(_model) {
- _model.on("change remove", function(_model) {
- _thrSave();
- });
- _thrSave();
- });
-}
--- a/server/src/main/webapp/static/js/i18n.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-Rkns.i18n = {
- en: {
- edit_node: "Edit Node",
- edit_edge: "Edit Edge",
- edit_title: "Title:",
- edit_uri: "URI:",
- edit_description: "Description:",
- edit_from: "From:",
- edit_to: "To:",
- edit_image: "Image:",
- full_screen: "Full Screen",
- add_node: "Add Node",
- add_edge: "Add Edge",
- save_project: "Archive Project",
- created_by: "Created by:",
- zoom_in: "Zoom In",
- zoom_out: "Zoom Out",
- caption_edit: "Edit",
- caption_remove: "Remove",
- caption_link: "Link to another node",
- notif_add_node: "Click on the background canvas to add a node",
- notif_start_edge: "Click on a first node to start the edge",
- notif_end_edge: "Click on a second node to complete the edge",
- search_on_twitter: "Twitter",
- wiki_fr: "French Wikipedia",
- wiki_en: "English Wikipedia",
- wiki_ja: "Japanese Wikipedia",
- wiki_: "Wikipedia (Other Language)",
- untitled_project: "Untitled project"
- },
- fr: {
- edit_node: "Édition d’un nœud",
- edit_edge: "Édition d’un lien",
- edit_title: "Titre :",
- edit_uri: "URI :",
- edit_description: "Description :",
- edit_from: "De :",
- edit_to: "Vers :",
- edit_image: "Image :",
- full_screen: "Mode plein écran",
- add_node: "Ajouter un nœud",
- add_edge: "Ajouter un lien",
- save_project: "Archiver le projet",
- created_by: "Créé par :",
- zoom_in: "Agrandir l’échelle",
- zoom_out: "Rapetisser l’échelle",
- caption_edit: "Éditer",
- caption_remove: "Supprimer",
- caption_link: "Créer un lien",
- notif_add_node: "Cliquer sur le fond du graphe pour rajouter un nœud",
- notif_start_edge: "Cliquer sur un premier nœud pour commencer le lien",
- notif_end_edge: "Cliquer sur un second nœud pour terminer le lien",
- search_on_twitter: "Twitter",
- wiki_fr: "Wikipedia en Français",
- wiki_en: "Wikipedia en Anglais",
- wiki_ja: "Wikipedia en Japonais",
- wiki_: "Wikipedia (Autre langue)",
- untitled_project: "Projet sans titre"
- }
-}
--- a/server/src/main/webapp/static/js/ldtjson-bin.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-Rkns.Ldt = {}
-
-Rkns.Ldt.ProjectBin = Rkns.Utils.inherit(Rkns._BaseBin);
-
-Rkns.Ldt.ProjectBin.prototype.tagTemplate = Rkns._.template(
- '<li class="Rk-Bin-Item" data-image="<%=static_url%>img/ldt-tag.png" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" data-title="<%-title%>" data-description="Tag \'<%-title%>\'">'
- + '<img class="Rk-Ldt-Tag-Icon" src="<%=static_url%>img/ldt-tag.png" /><h4><%=htitle%></h4><div class="Rk-Clear"></div></li>'
-);
-
-Rkns.Ldt.ProjectBin.prototype.annotationTemplate = Rkns._.template(
- '<li class="Rk-Bin-Item" data-image="<%=image%>" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" data-title="<%-title%>" data-description="<%-description%>">'
- + '<img class="Rk-Ldt-Annotation-Icon" src="<%=image%>"/><h4><%=htitle%></h4><p><%=hdescription%></p><p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p><div class="Rk-Clear"></div></li>'
-);
-
-Rkns.Ldt.ProjectBin.prototype._init = function(_renkan, _opts) {
- this.renkan = _renkan;
- this.proj_id = _opts.project_id;
- this.ldt_platform = _opts.ldt_platform || "http://ldt.iri.centrepompidou.fr/";
- this.title_$.html(_opts.title);
- this.refresh();
-}
-
-Rkns.Ldt.ProjectBin.prototype.render = function(searchstr) {
- if (searchstr) {
- var rxbase = searchstr.replace(/(\W)/g,'\\$1'),
- _rgxp = new RegExp('('+rxbase+')','gi'),
- rxtest = new RegExp(rxbase,'i')
- }
- function highlight(_text) {
- return searchstr ? _text.replace(_rgxp, "<span class='searchmatch'>$1</span>") : _text;
- }
- function convertTC(_ms) {
- function pad(_n) {
- var _res = _n.toString();
- while (_res.length < 2) {
- _res = '0' + _res;
- }
- return _res;
- }
- var _totalSeconds = Math.abs(Math.floor(_ms/1000)),
- _hours = Math.floor(_totalSeconds / 3600),
- _minutes = (Math.floor(_totalSeconds / 60) % 60),
- _seconds = _totalSeconds % 60,
- _res = '';
- if (_hours) {
- _res += pad(_hours) + ':'
- }
- _res += pad(_minutes) + ':' + pad(_seconds);
- return _res;
- }
-
- var _html = '<li><h3>Tags</h3></li>',
- _projtitle = this.data.meta["dc:title"],
- _this = this,
- count = 0;
- _this.title_$.text('LDT Project: "' + _projtitle + '"');
- Rkns._(_this.data.tags).map(function(_tag) {
- var _title = _tag.meta["dc:title"];
- if (searchstr && !rxtest.test(_title)) {
- return;
- }
- count++;
- _html += _this.tagTemplate({
- ldt_platform: _this.ldt_platform,
- title: _title,
- htitle: highlight(_title),
- encodedtitle : encodeURIComponent(_title),
- static_url : _this.renkan.static_url
- })
- });
- _html += '<li><h3>Annotations</h3></li>';
- Rkns._(_this.data.annotations).map(function(_annotation) {
- var _description = _annotation.content.description,
- _title = _annotation.content.title.replace(_description,"");
- if (searchstr && !rxtest.test(_title) && !rxtest.test(_description)) {
- return;
- }
- count++;
- var _duration = _annotation.end - _annotation.begin,
- _img = (
- (_annotation.content && _annotation.content.img && _annotation.content.img.src)
- ? _annotation.content.img.src
- : _this.renkan.static_url + ( _duration ? "img/ldt-segment.png" : "img/ldt-point.png" )
- );
- _html += _this.annotationTemplate({
- ldt_platform: _this.ldt_platform,
- static_url: _this.renkan.static_url,
- title: _title,
- htitle: highlight(_title),
- description: _description,
- hdescription: highlight(_description),
- start: convertTC(_annotation.begin),
- end: convertTC(_annotation.end),
- duration: convertTC(_duration),
- mediaid: _annotation.media,
- annotationid: _annotation.id,
- image: _img
- });
- });
-
- this.main_$.html(_html);
- if (searchstr && count) {
- this.count_$.text(count).show();
- } else {
- this.count_$.hide();
- }
- if (searchstr && !count) {
- this.$.hide();
- } else {
- this.$.show();
- }
- this.renkan.resizeBins();
-}
-
-Rkns.Ldt.ProjectBin.prototype.refresh = function() {
- var _this = this;
- Rkns.$.ajax({
- url: this.ldt_platform + 'ldtplatform/ldt/cljson/id/' + this.proj_id,
- dataType: "jsonp",
- success: function(_data) {
- _this.data = _data;
- _this.render();
- }
- });
-}
\ No newline at end of file
--- a/server/src/main/webapp/static/js/main.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/*
- * Copyright 2012 Institut de recherche et d'innovation
- * contributor(s) : Yves-Marie Haussonne, Raphael Velt, Samuel Huron
- *
- * contact@iri.centrepompidou.fr
- * http://www.iri.centrepompidou.fr
- *
- * This software is a computer program whose purpose is to show and add annotations on a video .
- * This software is governed by the CeCILL-C license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL-C
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL-C license and that you accept its terms.
-*/
-
-/* Declaring the Renkan Namespace Rkns and Default values */
-
-if (typeof Rkns !== "object") {
- Rkns = {}
-}
-
-Rkns.$ = jQuery;
-
-Rkns._ = _;
-
-Rkns.pickerColors = ["#8f1919", "#a80000", "#d82626", "#ff0000", "#e87c7c", "#ff6565", "#f7d3d3", "#fecccc", "#8f5419", "#a85400", "#d87f26", "#ff7f00", "#e8b27c", "#ffb265", "#f7e5d3", "#fee5cc", "#8f8f19", "#a8a800", "#d8d826", "#feff00", "#e8e87c", "#feff65", "#f7f7d3", "#fefecc", "#198f19", "#00a800", "#26d826", "#00ff00", "#7ce87c", "#65ff65", "#d3f7d3", "#ccfecc", "#198f8f", "#00a8a8", "#26d8d8", "#00feff", "#7ce8e8", "#65feff", "#d3f7f7", "#ccfefe", "#19198f", "#0000a8", "#2626d8", "#0000ff", "#7c7ce8", "#6565ff", "#d3d3f7", "#ccccfe", "#8f198f", "#a800a8", "#d826d8", "#ff00fe", "#e87ce8", "#ff65fe", "#f7d3f7", "#feccfe", "#000000", "#242424", "#484848", "#6d6d6d", "#919191", "#b6b6b6", "#dadada", "#ffffff"];
-
-Rkns._BaseBin = function(_renkan, _opts) {
- if (typeof _renkan !== "undefined") {
- this.renkan = _renkan;
- this.renkan.$.find(".Rk-Bin-Main").hide();
- this.$ = Rkns.$('<li>')
- .addClass("Rk-Bin")
- .appendTo(_renkan.$.find(".Rk-Bin-List"));
- this.title_icon_$ = Rkns.$('<span>')
- .addClass("Rk-Bin-Title-Icon")
- .appendTo(this.$);
-
- var _this = this;
-
- Rkns.$('<a>')
- .attr("href","#")
- .addClass("Rk-Bin-Close")
- .html('×')
- .appendTo(this.$)
- .click(function() {
- _this.destroy();
- return false;
- });
- Rkns.$('<a>')
- .attr("href","#")
- .addClass("Rk-Bin-Refresh")
- .appendTo(this.$)
- .click(function() {
- _this.refresh();
- return false;
- });
- this.count_$ = Rkns.$('<div>')
- .addClass("Rk-Bin-Count")
- .appendTo(this.$);
- this.title_$ = Rkns.$('<h2>')
- .addClass("Rk-Bin-Title")
- .appendTo(this.$);
- this.main_$ = Rkns.$('<div>')
- .addClass("Rk-Bin-Main")
- .appendTo(this.$);
- this.title_$.html(_opts.title || '(new bin)');
- this.renkan.resizeBins();
-
- if (_opts.auto_refresh) {
- window.setInterval(function() {
- _this.refresh();
- },_opts.auto_refresh)
- }
- }
-}
-
-Rkns._BaseBin.prototype.destroy = function() {
- this.$.detach();
- this.renkan.resizeBins();
-}
-
-/* Point of entry */
-
-Rkns.Renkan = function(_opts) {
- if (typeof _opts.language !== "string" || typeof Rkns.i18n[_opts.language] == "undefined") {
- _opts.language = "en";
- }
- if (typeof _opts.container !== "string") {
- _opts.container = "renkan";
- }
- if (typeof _opts.search !== "object" || !_opts.search) {
- _opts.search = [];
- }
- if (typeof _opts.static_url !== "string") {
- _opts.static_url = "";
- }
- this.project = new Rkns.Models.Project();
- this.language = _opts.language;
- this.static_url = _opts.static_url;
- this.l10n = Rkns.i18n[_opts.language];
- if (typeof _opts.user_id !== "undefined") {
- this.current_user = _opts.user_id;
- }
- this.$ = Rkns.$("#" + _opts.container);
- this.$
- .addClass("Rk-Main")
- .html(this.template());
- this.renderer = new Rkns.Renderer.Scene(this);
- this.tabs = [];
- this.search_engines = [];
- this.selected_bin_item = undefined;
-
- this.current_user_list = new Rkns.Models.UsersList();
-
- var _this = this;
- this.$.mouseup(function() {
- _this.selected_bin_item = undefined;
- _this.$.find(".Rk-Bin-Item.dragging").removeClass("dragging");
- });
- if (!_opts.search.length) {
- this.$.find(".Rk-Web-Search-Form").detach();
- } else {
- var _tmpl = Rkns._.template('<li class="<%= className %>" data-key="<%= key %>"><%= title %></li>'),
- _select = this.$.find(".Rk-Search-List"),
- _input = this.$.find(".Rk-Web-Search-Input")
- _form = this.$.find(".Rk-Web-Search-Form");
- Rkns._(_opts.search).each(function(_search, _key) {
- var _searchObj = new _search.type(_this, _search);
- _this.search_engines.push(_searchObj);
- });
- _select.html(
- Rkns._(this.search_engines).map(function(_search, _key) {
- return _tmpl({
- key: _key,
- title: _search.getSearchTitle(),
- className: _search.getBgClass()
- });
- }).join("")
- );
- _select.find("li").click(function() {
- var _el = Rkns.$(this);
- _this.setSearchEngine(_el.attr("data-key"));
- _form.submit();
- });
- _form.submit(function() {
- if (_input.val()) {
- var _search = _this.search_engine;
- _search.search(_input.val());
- }
- return false;
- });
- this.$.find(".Rk-Search-Current").mouseenter(
- function() { _select.slideDown(); }
- );
- this.$.find(".Rk-Search-Select").mouseleave(
- function() { _select.slideUp(); }
- );
- this.setSearchEngine(0);
- }
- Rkns._(_opts.bins).each(function(_bin) {
- _this.tabs.push(new _bin.bin(_this, _bin));
- });
-
- this.$.find(".Rk-Bins")
- .on("click",".Rk-Bin-Title,.Rk-Bin-Title-Icon", function() {
- var _mainDiv = Rkns.$(this).siblings(".Rk-Bin-Main");
- if (_mainDiv.is(":hidden")) {
- _this.$.find(".Rk-Bin-Main").slideUp();
- _mainDiv.slideDown();
- }
- }).on("mousedown", ".Rk-Bin-Item", function() {
- var _t = Rkns.$(this);
- _t.addClass("dragging");
- _this.selected_bin_item = {
- uri : $(_t).attr("data-uri"),
- title : $(_t).attr("data-title"),
- description : $(_t).attr("data-description"),
- image: $(_t).attr("data-image")
- }
- return false;
- }).on("mouseover", ".Rk-Bin-Item", function(_e) {
- var _t = Rkns.$(this);
- if (_t && $(_t).attr("data-uri")) {
- var _models = _this.project.get("nodes").where({
- uri: $(_t).attr("data-uri")
- });
- Rkns._(_models).each(function(_model) {
- _this.renderer.highlightModel(_model);
- });
- }
- }).mouseout(function() {
- _this.renderer.unhighlightAll();
- });
- Rkns.$(window).resize(function() {
- _this.resizeBins();
- });
-
- this.$.find(".Rk-Bins-Search-Input").on("change keyup paste input", function() {
- var val = Rkns.$(this).val();
- Rkns._(_this.tabs).each(function(tab) {
- tab.render(val);
- });
- });
- this.$.find(".Rk-Bins-Search-Form").submit(function() {
- return false
- });
-}
-
-Rkns.Renkan.prototype.template = Rkns._.template(
- '<div class="Rk-Title"><h1>Hyper Plateau</h1></div><div class="Rk-Bins">'
- + '<form class="Rk-Web-Search-Form Rk-Search-Form"><input class="Rk-Web-Search-Input Rk-Search-Input" type="search" placeholder="Search the Web" />'
- + '<div class="Rk-Search-Select"><div class="Rk-Search-Current"></div><ul class="Rk-Search-List"></ul></div>'
- + '<input type="submit" value="" class="Rk-Web-Search-Submit Rk-Search-Submit" /></form>'
- + '<form class="Rk-Bins-Search-Form Rk-Search-Form"><input class="Rk-Bins-Search-Input Rk-Search-Input" type="search" placeholder="Search in Bins" />'
- + '<input type="submit" value="" class="Rk-Bins-Search-Submit Rk-Search-Submit" /></form>'
- + '<ul class="Rk-Bin-List"></ul></div><div class="Rk-Render Rk-Render-Panel"></div>'
-);
-
-
-Rkns.Renkan.prototype.setSearchEngine = function(_key) {
- this.search_engine = this.search_engines[_key];
- this.$.find(".Rk-Search-Current").attr("class","Rk-Search-Current " + this.search_engine.getBgClass());
-}
-
-Rkns.Renkan.prototype.resizeBins = function() {
- var _d = + this.$.find(".Rk-Web-Search-Form").outerHeight() + this.$.find(".Rk-Bins-Search-Form").outerHeight();
- this.$.find(".Rk-Bin-Title:visible").each(function() {
- _d += Rkns.$(this).outerHeight();
- });
- this.$.find(".Rk-Bin-Main").css({
- height: this.$.find(".Rk-Bins").height() - _d
- });
-}
-
-/* Utility functions */
-
-Rkns.Utils = {
- _ID_AUTO_INCREMENT : 0,
- _ID_BASE : (function(_d) {
- function pad(n){return n<10 ? '0'+n : n}
- function fillrand(n) {
- var _res = ''
- for (var i=0; i<n; i++) {
- _res += Math.floor(16*Math.random()).toString(16);
- }
- return _res;
- }
- return _d.getUTCFullYear() + '-'
- + pad(_d.getUTCMonth()+1) + '-'
- + pad(_d.getUTCDate()) + '-'
- + fillrand(16);
- })(new Date()),
- getUID : function(_base) {
- var _n = (++this._ID_AUTO_INCREMENT).toString(16),
- _base = (typeof _base === "undefined" ? "" : _base + "-" );
- while (_n.length < 4) {
- _n = '0' + _n
- }
- return _base + this._ID_BASE + '-' + _n;
- },
- inherit : function(_baseClass, _callbefore) {
- var _class = function() {
- if (typeof _callbefore === "function") {
- _callbefore.apply(this, Array.prototype.slice.call(arguments, 0));
- }
- _baseClass.apply(this, Array.prototype.slice.call(arguments, 0));
- if (typeof this._init == "function") {
- this._init.apply(this, Array.prototype.slice.call(arguments, 0));
- }
- }
- _class.prototype = new _baseClass();
- return _class;
- }
-}
\ No newline at end of file
--- a/server/src/main/webapp/static/js/main_coweb.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-//
-// Cooperative web application template.
-//
-// Copyright (c) The Dojo Foundation 2011. All Rights Reserved.
-//
-
-// assumes admin servlet deployed with the application
-var cowebConfig = {
- adminUrl : './admin'
-};
-
-//require(['corenkan']);
-
-require({moduleUrl : 'lib'},
- ['coweb/main','dojo', 'corenkan'],
-function(coweb, dojo, corenkan) {
- // do application setup here
-
- dojo.ready(function() {
- //this.collab = corenkan.app.collab;
- });
-
-});
-
--- a/server/src/main/webapp/static/js/main_test_models.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-(function() {
-
- var root = this;
-
- var Backbone = root.Backbone;
-
- var Rkns = root.Rkns = {};
-
- root.ModelView = Backbone.View.extend({
-
- events : {
- "click .show_form" : "show_form",
- "click .remove_button" : "remove_click",
- },
-
- initialize: function(options) {
- _.bindAll(this);
- this.template = _.template(options.template);
- this.model.bind("change", this.render);
- this.form_view = options.form_view;
- this.form_el = options.form_el;
- if(typeof options.getJSON === "function") {
- this.getJSON = options.getJSON;
- }
- },
- render: function() {
- $(this.el).html(this.template(this.getJSON()));
- return this;
- },
- show_form: function(evt) {
- if(typeof this.form_view !== "undefined") {
- this.form_view.render();
- $(this.form_el).empty();
- $(this.form_el).append(this.form_view.el);
- }
- },
- getJSON : function() {
- return this.model.toJSON();
- },
- remove_click : function(evt) {
- var obj_id = $(evt.currentTarget).attr("value");
- if(typeof this.model.collection !== "undefined") {
- this.model.collection.remove(this.model);
- }
- },
-
- });
-
- root.ColView = Backbone.View.extend({
- initialize: function(options) {
-
- _.bindAll(this);
- this.element = options.element;
- this.element_form = options.element_form;
- this.element_form_el = options.element_form_el;
- this.rendered = false;
-
- var that = this;
- this.element_views = [];
-
- var that = this;
- this.collection.each(function(elt) {
- that.add(elt);
- });
-
- this.collection.bind('add', this.add);
- this.collection.bind('remove', this.remove);
- },
-
- render : function() {
- this.rendered = true;
- var that = this;
- this.$el.empty();
- _(this.element_views).each(function(dvs){
- that.$el.append(dvs.disp.render().el);
- });
-
- return this;
- },
-
- add : function(elt) {
-
- var fv_args = _.extend({}, this.element_form, {model: elt});
- var fv = new FormView(fv_args);
-
- var dv_args = _.extend({}, this.element, {model: elt, tagName: 'li', form_view: fv, form_el: this.element_form_el});
- var dv = new ModelView(dv_args);
-
- this.element_views.push({disp:dv, form:fv});
-
- if(this.rendered) {
- this.$el.append(dv.render().el);
- }
- },
-
-
- remove : function(elt) {
- var viewsToRemove = _(this.element_views).select(function(cvs) { return cvs.disp.model === elt; })[0];
- this.element_views = _(this.element_views).without(viewsToRemove);
-
- if(this.rendered) {
- viewsToRemove.disp.$el.remove();
- viewsToRemove.form.$el.remove();
- }
- },
-
- remove_click : function(evt) {
- var obj_id = $(evt.currentTarget).attr("value");
- this.collection.remove(this.collection.get(obj_id));
- }
-
- });
-
- root.FormView = Backbone.View.extend({
- events : {
- "change .form_field": "changed"
- },
- initialize: function(options) {
- _.bindAll(this);
- this.template = _.template(options.template);
- this.model.bind("change", this.render);
- if(typeof options.getJSON === "function") {
- this.getJSON = options.getJSON;
- }
- },
- render: function() {
- this.$el.html(this.template(this.getJSON()));
- return this;
- },
- changed: function(evt) {
- var value = $(evt.currentTarget).val();
- var field_name = $(evt.currentTarget).attr("name");
- if(this.model.get(field_name) != value) {
- this.model.set(field_name, value);
- }
- },
- getJSON : function() {
- return this.model.toJSON();
- }
- });
-
-
- root.SelectCurrentUserView = Backbone.View.extend({
- initialize: function(options) {
- _.bindAll(this);
- this.rendered = false;
-
- this.child_view_constructor = options.child_view_constructor;
- this.child_tag_name = options.child_tag_name;
-
- this.children_views = [];
- this.collection.each(this.add);
-
- this.collection.bind('add', this.add);
- this.collection.bind('remove', this.remove);
- },
- add: function(elt) {
- var child_view = new this.child_view_constructor({
- model: elt,
- tagName : this.child_tag_name
- });
- this.children_views.push(child_view);
-
- if (this.rendered) {
- this.$el.append(child_view.render().el);
- }
- },
- remove: function(elt) {
- var view_to_remove = _(this.children_views).select(function(cv) { return cv.model === elt; })[0];
- this.children_views = _(this.children_views).without(view_to_remove);
- if (this.rendered) {
- view_to_remove.$el.remove();
- }
- },
- render: function() {
- this.rendered = true;
- var that = this;
-
- this.$el.empty().html("<option value=\"\">Unknown</option>");
-
- _(this.children_views).each(function(cv){
- that.$el.append(cv.render().el);
- });
-
- return this;
- }
-
- });
-
- root.SelectUserView = Backbone.View.extend({
- initialize: function(options) {
- _.bindAll(this);
- this.model.bind("change", this.render);
- },
- render: function() {
- this.$el.val(this.model.id).text(this.model.get("title"));
- return this;
- }
- });
-
- root.CurrentUserView = Backbone.View.extend({
- initialize : function() {
- this._select_view = new SelectCurrentUserView({
- el : this.el,
- collection : this.model.get("users"),
- child_view_constructor: SelectUserView,
- child_tag_name: "option",
- });
- },
- render: function() {
- this.$el.empty();
- this._select_view.render();
- return this;
- }
-
- });
-
-
- root.BasicListView = Backbone.View.extend({
-
- initialize: function(options) {
- _.bindAll(this);
-
- this.element_view_constructor = options.element_view_constructor;
- if(typeof options.template !== "undefined") {
- this.template = _.template(options.template);
- }
-
- this.rendered = false;
- this.element_views = [];
- this.collection.each(this.add);
-
- this.collection.bind('add', this.add);
- this.collection.bind('remove', this.remove);
- this.collection.bind('reset', this.reset);
- this.collection.bind('destroy', this.destroy);
- },
-
- render: function() {
- this.rendered = true;
- var that = this;
- this.$el.empty();
- if(typeof this.template !== "undefined") {
- var data = {};
- if(typeof this.model !== "undefined") {
- data = this.$el.model.toJSON();
- }
- this.$el.html(this.template(data));
- }
- _(this.element_views).each(function(dvs){
- that.$el.append(dvs.render().el);
- });
-
- return this;
- },
-
- add: function(elt) {
- var element_view = new this.element_view_constructor({model: elt});
- this.element_views.push(element_view);
- if(this.rendered) {
- this.$el.append(element_view.render().el);
- }
- },
-
- remove: function(elt) {
- var element_view = _(this.element_views).select(function(cv) {return cv.model === elt;})[0];
- this.element_views = _(this.element_views).without(element_view);
- if(this.rendered) {
- element_view.$el.remove();
- }
-
- },
-
- reset: function() {
- _(this.element_views).each(function(cv) {
- cv.$el.remove();
- });
- this.element_views = [];
- this.collection.each(this.add);
- }
-
- });
-
-
- root.BasicModelView = Backbone.View.extend({
-
- initialize: function(options) {
- _.bindAll(this);
- if(typeof options.template !== "undefined") {
- this.template = _.template(options.template);
- }
- if(typeof options.getJSON === "function") {
- this.getJSON = options.getJSON;
- }
- this.model.bind("change", this.render);
- },
- render: function() {
- $(this.el).html(this.template(this.getJSON()));
- return this;
- },
- getJSON : function() {
- return this.model.toJSON();
- }
- });
-
-}).call(this);
--- a/server/src/main/webapp/static/js/models.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-(function() {
-
- var root = this;
-
- var Backbone = root.Backbone;
-
- var Models = root.Rkns.Models = {};
-
-
- Models.getUID = function(obj) {
- var guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
- return v.toString(16);
- });
- return obj.type + "-" + guid;
- };
-
-
- var RenkanModel = Backbone.RelationalModel.extend({
- idAttribute : "_id",
- constructor: function(options) {
-
- if (typeof options !== "undefined") {
- options._id = options._id || options.id || Models.getUID(this);
- options.title = options.title || "(untitled " + this.type + ")";
- options.description = options.description || "";
- options.uri = options.uri || "";
-
- if(typeof this.prepare === "function") {
- options = this.prepare(options);
- }
- }
- Backbone.RelationalModel.prototype.constructor.call(this, options);
- },
- validate: function() {
- if(!this.type) {
- return "object has no type";
- }
- },
- addReference : function(_options, _propName, _list, _id, _default) {
- var _element = _list.get(_id);
- if (typeof _element === "undefined" && typeof _default !== "undefined") {
- _options[_propName ] = _default;
- }
- else {
- _options[_propName ] = _element;
- }
- }
- });
-
- // USER
- var User = Models.User = RenkanModel.extend({
- type: "user",
- prepare: function(options) {
- options.color = options.color || "#666666";
- return options;
- },
- toJSON: function() {
- return {
- _id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- color: this.get("color"),
- };
- },
- });
-
- // NODE
- var Node = Models.Node = RenkanModel.extend({
- type: "node",
- relations: [{
- type: Backbone.HasOne,
- key: "created_by",
- relatedModel: User
- }],
- prepare: function(options) {
- project = options.project;
- this.addReference(options, "created_by", project.get("users"), options.created_by, project.current_user);
- options.description = options.description || "";
- return options;
- },
- toJSON: function() {
- return {
- _id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- position: this.get("position"),
- image: this.get("image"),
- color: this.get("color"),
- created_by: this.get("created_by") ? this.get("created_by").get("_id") : null
- };
- },
- });
-
- // EDGE
- var Edge = Models.Edge = RenkanModel.extend({
- type: "edge",
- relations: [
- {
- type: Backbone.HasOne,
- key: "created_by",
- relatedModel: User
- },
- {
- type: Backbone.HasOne,
- key: "from",
- relatedModel: Node
- },
- {
- type: Backbone.HasOne,
- key: "to",
- relatedModel: Node
- },
- ],
- prepare: function(options) {
- project = options.project;
- this.addReference(options, "created_by", project.get("users"), options.created_by, project.current_user);
- this.addReference(options, "from", project.get("nodes"), options.from);
- this.addReference(options, "to", project.get("nodes"), options.to);
- return options;
- },
- toJSON: function() {
- return {
- _id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- from: this.get("from") ? this.get("from").get("_id") : null,
- to: this.get("to") ? this.get("to").get("_id") : null,
- color: this.get("color"),
- created_by: this.get("created_by") ? this.get("created_by").get("_id") : null
- };
- },
- });
-
- // PROJECT
- var Project = Models.Project = RenkanModel.extend({
- type: "project",
- relations: [
- {
- type: Backbone.HasMany,
- key: "users",
- relatedModel: User,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- },
- {
- type: Backbone.HasMany,
- key: "nodes",
- relatedModel: Node,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- },
- {
- type: Backbone.HasMany,
- key: "edges",
- relatedModel: Edge,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- }
- ],
- addUser: function(_props, _options) {
- _props.project = this;
- var _user = User.findOrCreate(_props);
- this.get("users").push(_user, _options);
- return _user;
- },
- addNode: function(_props, _options) {
- _props.project = this;
- var _node = Node.findOrCreate(_props);
- this.get("nodes").push(_node, _options);
- return _node;
- },
- addEdge: function(_props, _options) {
- _props.project = this;
- var _edge = Edge.findOrCreate(_props);
- this.get("edges").push(_edge, _options);
- return _edge;
- },
- removeNode: function(_model) {
- this.get("nodes").remove(_model);
- },
- removeEdge: function(_model) {
- this.get("edges").remove(_model);
- },
- validate: function(options) {
- var _project = this;
- _(options.users).each(function(_item) {
- _item.project = _project;
- });
- _(options.nodes).each(function(_item) {
- _item.project = _project;
- });
- _(options.edges).each(function(_item) {
- _item.project = _project;
- });
- },
- // Add event handler to remove edges when a node is removed
- initialize: function() {
- var _this = this;
- this.on("remove:nodes", function(_node) {
- _this.get("edges").remove(
- _this.get("edges").filter(function(_edge) {
- return _edge.get("from") == _node || _edge.get("to") == _node;
- })
- );
- });
- }
- });
-
- var RosterUser = Models.RosterUser = Backbone.Model.extend({
- type: "roster_user",
- idAttribute : "_id",
-
- constructor: function(options) {
-
- if (typeof options !== "undefined") {
- options._id = options._id || options.id || Models.getUID(this);
- options.title = options.title || "(untitled " + this.type + ")";
- options.description = options.description || "";
- options.uri = options.uri || "";
- options.project = options.project || null;
- options.site_id = options.site_id || 0;
-
- if(typeof this.prepare === "function") {
- options = this.prepare(options);
- }
- }
- Backbone.Model.prototype.constructor.call(this, options);
- },
-
- validate: function() {
- if(!this.type) {
- return "object has no type";
- }
- },
-
- prepare: function(options) {
- options.color = options.color || "#666666";
- return options;
- },
-
- toJSON: function() {
- return {
- _id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- color: this.get("color"),
- project: (this.get("project") != null)?this.get("project").get("id"):null,
- site_id: this.get("site_id")
- };
- },
- });
-
- var UsersList = Models.UsersList = Backbone.Collection.extend({
- model: RosterUser
- });
-
-
-}).call(window);
-
--- a/server/src/main/webapp/static/js/paper-renderer.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1455 +0,0 @@
-Rkns.Renderer = {
- _MARGIN_X: 80,
- _MARGIN_Y: 50,
- _MIN_DRAG_DISTANCE: 2,
- _NODE_RADIUS: 25,
- _NODE_BUTTON_INNER: 26,
- _NODE_BUTTON_OUTER: 60,
- _EDGE_BUTTON_INNER: 1,
- _EDGE_BUTTON_OUTER: 40,
- _NODE_FONT_SIZE: 10,
- _EDGE_FONT_SIZE: 9,
- _NODE_MAX_CHAR: 50,
- _EDGE_MAX_CHAR: 40,
- _ARROW_LENGTH: 16,
- _ARROW_WIDTH: 8,
- _EDITOR_ARROW_LENGTH : 20,
- _EDITOR_ARROW_WIDTH : 40,
- _EDITOR_MARGIN : 15,
- _EDITOR_PADDING : 10,
- _EDITOR_GRADIENT : new paper.Gradient(['#f0f0f0', '#d0d0d0']),
- _CLICKMODE_ADDNODE : 1,
- _CLICKMODE_STARTEDGE : 2,
- _CLICKMODE_ENDEDGE : 3,
- _USER_PLACEHOLDER : {
- color: "#000000",
- title: "(unknown user)",
- get: function(attr) {
- return this[attr] || false;
- }
- }
-}
-
-Rkns.Renderer.Utils = {
- drawEditBox : function(_coords, _path, _width, _xmargin, _selector) {
- _selector.css({
- width: (_width - 2* Rkns.Renderer._EDITOR_PADDING),
- })
- var _height = _selector.outerHeight() + 2* Rkns.Renderer._EDITOR_PADDING,
- _isLeft = (_coords.x < paper.view.center.x ? 1 : -1),
- _left = _coords.x + _isLeft * ( _xmargin + Rkns.Renderer._EDITOR_ARROW_LENGTH ),
- _right = _coords.x + _isLeft * ( _xmargin + Rkns.Renderer._EDITOR_ARROW_LENGTH + _width ),
- _top = _coords.y - _height / 2;
- if (_top < Rkns.Renderer._EDITOR_MARGIN) {
- _top = Math.min( Rkns.Renderer._EDITOR_MARGIN, _coords.y - Rkns.Renderer._EDITOR_ARROW_WIDTH / 2 );
- }
- var _bottom = _top + _height;
- if (_bottom > (paper.view.size.height - Rkns.Renderer._EDITOR_MARGIN)) {
- _bottom = Math.max( paper.view.size.height - Rkns.Renderer._EDITOR_MARGIN, _coords.y + Rkns.Renderer._EDITOR_ARROW_WIDTH / 2 );
- _top = _bottom - _height;
- }
- _path.segments[0].point
- = _path.segments[7].point
- = _coords.add([_isLeft * _xmargin, 0]);
- _path.segments[1].point.x
- = _path.segments[2].point.x
- = _path.segments[5].point.x
- = _path.segments[6].point.x
- = _left;
- _path.segments[3].point.x
- = _path.segments[4].point.x
- = _right;
- _path.segments[2].point.y
- = _path.segments[3].point.y
- = _top;
- _path.segments[4].point.y
- = _path.segments[5].point.y
- = _bottom;
- _path.segments[1].point.y = _coords.y - Rkns.Renderer._EDITOR_ARROW_WIDTH / 2;
- _path.segments[6].point.y = _coords.y + Rkns.Renderer._EDITOR_ARROW_WIDTH / 2;
- _path.closed = true;
- _path.fillColor = new paper.GradientColor(Rkns.Renderer._EDITOR_GRADIENT, [0,_top], [0, _bottom]);
- _selector.css({
- left: (Rkns.Renderer._EDITOR_PADDING + Math.min(_left, _right)),
- top: (Rkns.Renderer._EDITOR_PADDING + _top)
- });
- },
- sector : function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgsrc, _caption) {
- var _startRads = _startAngle * Math.PI / 180,
- _endRads = _endAngle * Math.PI / 180,
- _img = new Image(),
- _span = _endRads - _startRads,
- _k = .0879 * _span,
- _kin = _k * _inR,
- _kout = _k * _outR,
- _startdx = - Math.sin(_startRads),
- _startdy = Math.cos(_startRads),
- _startXIn = Math.cos(_startRads) * _inR + _padding * _startdx,
- _startYIn = Math.sin(_startRads) * _inR + _padding * _startdy,
- _startXOut = Math.cos(_startRads) * _outR + _padding * _startdx,
- _startYOut = Math.sin(_startRads) * _outR + _padding * _startdy,
- _enddx = - Math.sin(_endRads),
- _enddy = Math.cos(_endRads),
- _endXIn = Math.cos(_endRads) * _inR - _padding * _enddx,
- _endYIn = Math.sin(_endRads) * _inR - _padding * _enddy,
- _endXOut = Math.cos(_endRads) * _outR - _padding * _enddx,
- _endYOut = Math.sin(_endRads) * _outR - _padding * _enddy,
- _centerR = (_inR + _outR)/2,
- _centerRads = (_startRads + _endRads) / 2,
- _centerX = Math.cos(_centerRads) * _centerR,
- _centerY = Math.sin(_centerRads) * _centerR,
- _textX = Math.cos(_centerRads) * (_outR + 3),
- _textY = Math.sin(_centerRads) * (_outR + 3),
- _segments = [];
- _segments.push([[_startXIn, _startYIn], [0, 0], [ _kin * _startdx, _kin * _startdy ]]);
- for (var i = 1; i < 4; i++) {
- var _rads = i * _span / 4 + _startRads,
- _dx = - Math.sin(_rads),
- _dy = Math.cos(_rads),
- _x = Math.cos(_rads) * _inR,
- _y = Math.sin(_rads) * _inR;
- _segments.push([[_x, _y], [ - _kin * _dx, - _kin * _dy], [ _kin * _dx, _kin * _dy ]]);
- }
- _segments.push([[_endXIn, _endYIn], [ - _kin * _enddx, - _kin * _enddy ], [0,0]]);
- _segments.push([[_endXOut, _endYOut], [ 0,0 ], [ - _kout * _enddx, - _kout * _enddy ]]);
- for (var i = 3; i > 0; i--) {
- var _rads = i * _span / 4 + _startRads,
- _dx = - Math.sin(_rads),
- _dy = Math.cos(_rads),
- _x = Math.cos(_rads) * _outR,
- _y = Math.sin(_rads) * _outR;
- _segments.push([[_x, _y], [ _kout * _dx, _kout * _dy], [ - _kout * _dx, - _kout * _dy ]]);
- }
- _segments.push([[_startXOut, _startYOut], [ _kout * _startdx, _kout * _startdy ], [0, 0]]);
- var _path = new paper.Path();
- _path.add.apply(_path, _segments);
- _path.fillColor = "#333333";
- _path.opacity = .5;
- _path.closed = true;
- _path.__representation = _repr;
- if (_textX >= -2 && _textX <= 2) {
- if (_textY > 0) {
- _textY += 6;
- }
- }
- var _text = new paper.PointText(_textX,_textY);
- _text.characterStyle = {
- fontSize: 9,
- fillColor: '#c000c0'
- };
- if (_textX > 2) {
- _text.paragraphStyle.justification = 'left';
- } else if (_textX < -2) {
- _text.paragraphStyle.justification = 'right';
- } else {
- _text.paragraphStyle.justification = 'center';
- }
- _text.visible = false;
- var _visible = false,
- _restPos = new paper.Point(-200, -200),
- _grp = new paper.Group([_path, _text]),
- _delta = _grp.position,
- _imgdelta = new paper.Point([_centerX, _centerY]),
- _currentPos = new paper.Point(0,0);
- _text.content = _caption;
- _grp.visible = false;
- _grp.position = _restPos;
- var _res = {
- show: function() {
- _visible = true;
- _grp.position = _currentPos.add(_delta);
- _grp.visible = true;
- },
- moveTo: function(_point) {
- _currentPos = _point;
- if (_visible) {
- _grp.position = _point.add(_delta);
- }
- },
- hide: function() {
- _visible = false;
- _grp.visible = false;
- _grp.position = _restPos;
- },
- select: function() {
- _path.opacity = .8;
- _text.visible = true;
- },
- unselect: function() {
- _path.opacity = .5;
- _text.visible = false;
- },
- destroy: function() {
- _grp.remove();
- }
- }
- _img.onload = function() {
- var _h = _img.height;
- var _raster = new paper.Raster(_img);
- _raster.position = _imgdelta.add(_grp.position).subtract(_delta);
- _grp.addChild(_raster);
- }
- _img.src = _imgsrc;
- return _res
- }
-}
-
-Rkns.Renderer._BaseRepresentation = function(_renderer, _model) {
- if (typeof _renderer !== "undefined") {
- this.renderer = _renderer;
- this.project = _renderer.renkan.project;
- this.model = _model;
- if (this.model) {
- var _this = this;
- this._changeBinding = function() {
- _this.redraw();
- }
- this._removeBinding = function() {
- _renderer.removeRepresentation(_this);
- _renderer.redraw();
- }
- this.model.on("change", this._changeBinding );
- this.model.on("remove", this._removeBinding );
- }
- }
-}
-
-Rkns.Renderer._BaseRepresentation.prototype.super = function(_func) {
- Rkns.Renderer._BaseRepresentation.prototype[_func].apply(this, Array.prototype.slice.call(arguments, 1));
-}
-
-Rkns.Renderer._BaseRepresentation.prototype.select = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.unselect = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.highlight = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.unhighlight = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.mouseup = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.destroy = function() {
- if (this.model) {
- this.model.off("change", this._changeBinding );
- this.model.off("remove", this._removeBinding );
- }
-}
-
-Rkns.Renderer.Node = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.Node.prototype._init = function() {
- this.renderer.node_layer.activate();
- this.type = "Node";
- this.circle = new paper.Path.Circle([0, 0], Rkns.Renderer._NODE_RADIUS);
- this.circle.fillColor = '#ffffff';
- this.circle.__representation = this;
- this.circle.strokeWidth = 2;
- this.title = new paper.PointText([0,0]);
- this.title.characterStyle = {
- fontSize: Rkns.Renderer._NODE_FONT_SIZE,
- fillColor: 'black'
- };
- this.edit_button = new Rkns.Renderer.NodeEditButton(this.renderer, null);
- this.edit_button.node_representation = this;
- this.remove_button = new Rkns.Renderer.NodeRemoveButton(this.renderer, null);
- this.remove_button.node_representation = this;
- this.link_button = new Rkns.Renderer.NodeLinkButton(this.renderer, null);
- this.link_button.node_representation = this;
- this.title.paragraphStyle.justification = 'center';
-}
-
-Rkns.Renderer.Node.prototype.redraw = function() {
- var _model_coords = new paper.Point(this.model.get("position"));
- this.paper_coords = this.renderer.toPaperCoords(_model_coords);
- this.circle.position = this.paper_coords;
- this.title.content = this.model.get("title");
- this.title.position = this.paper_coords.add([0, Rkns.Renderer._NODE_RADIUS + 1.5 *Rkns.Renderer._NODE_FONT_SIZE]);
- this.circle.strokeColor = this.model.get("color") || (this.model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color");
- this.edit_button.moveTo(this.paper_coords);
- this.remove_button.moveTo(this.paper_coords);
- this.link_button.moveTo(this.paper_coords);
- var _img = this.model.get("image");
- if (_img && _img !== this.img) {
- var _image = new Image(),
- _this = this;
- _image.onload = function() {
- if (_this.node_image) {
- _this.node_image.remove();
- }
- _this.renderer.node_layer.activate();
- var _ratio = Math.min(1, 2 * Rkns.Renderer._NODE_RADIUS / _image.width, 2 * Rkns.Renderer._NODE_RADIUS / _image.height );
- var _raster = new paper.Raster(_image);
- var _clip = new paper.Path.Circle([0, 0], Rkns.Renderer._NODE_RADIUS);
- _raster.scale(_ratio);
- _this.node_image = new paper.Group(_clip, _raster);
- _this.node_image.opacity = .9;
- /* This is a workaround to allow clipping at group level
- * If opacity was set to 1, paper.js would merge all clipping groups in one (known bug).
- */
- _this.node_image.clipped = true;
- _this.node_image.position = _this.paper_coords;
- _this.node_image.__representation = _this;
- _clip.__representation = _this;
- paper.view.draw();
- }
- _image.src = _img;
- }
- this.img = _img;
- if (this.node_image) {
- if (!this.img) {
- this.node_image.remove();
- delete this.node_image;
- } else {
- this.node_image.position = this.paper_coords;
- }
- }
-
- Rkns._.each(this.project.get("edges").filter(function (ed) { return ((ed.to === this.model) || (ed.from === this.model));}), function(edge, index, list){
- var repr = this.renderer.getRepresentationByModel(edge);
- if(repr != null && typeof repr.from_representation.paper_coords !== "undefined" && typeof repr.to_representation.paper_coords !== "undefined") {
- repr.redraw();
- }
- }, this);
-}
-
-Rkns.Renderer.Node.prototype.paperShift = function(_delta) {
- var _coords = this.renderer.toModelCoords(this.paper_coords.add(_delta)),
- _data = {
- position: {
- x: _coords.x,
- y: _coords.y
- }
- };
- this.model.set(_data);
- //this.renderer.redraw();
-}
-
-Rkns.Renderer.Node.prototype.openEditor = function() {
- this.renderer.removeRepresentationsOfType("editor");
- var _editor = this.renderer.addRepresentation("NodeEditor",null);
- _editor.node_representation = this;
- _editor.draw();
-}
-
-Rkns.Renderer.Node.prototype.select = function() {
- this.circle.strokeWidth = 4;
- this.edit_button.show();
- this.remove_button.show();
- this.link_button.show();
- var _uri = this.model.get("uri");
- Rkns.$('.Rk-Bin-Item').each(function() {
- var _el = Rkns.$(this);
- if (_el.attr("data-uri") == _uri) {
- _el.addClass("selected");
- }
- });
-}
-
-Rkns.Renderer.Node.prototype.unselect = function(_newTarget) {
- if (!_newTarget || _newTarget.node_representation !== this) {
- this.edit_button.hide();
- this.remove_button.hide();
- this.link_button.hide();
- this.circle.strokeWidth = 2;
- Rkns.$('.Rk-Bin-Item').removeClass("selected");
- }
-}
-
-Rkns.Renderer.Node.prototype.highlight = function() {
- this.circle.fillColor = "#ffff80";
- if (this.node_image) {
- this.node_image.opacity = .5;
- }
-}
-
-Rkns.Renderer.Node.prototype.unhighlight = function(_newTarget) {
- this.circle.fillColor = "#ffffff";
- if (this.node_image) {
- this.node_image.opacity = .9;
- }
-}
-
-Rkns.Renderer.Node.prototype.mouseup = function(_event) {
- if (!this.renderer.is_dragging) {
- this.openEditor();
- }
- this.renderer.click_target = null;
- this.renderer.is_dragging = false;
-}
-
-Rkns.Renderer.Node.prototype.destroy = function(_event) {
- this.super("destroy");
- this.edit_button.destroy();
- this.remove_button.destroy();
- this.link_button.destroy();
- this.circle.remove();
- this.title.remove();
- if (this.node_image) {
- this.node_image.remove();
- }
-}
-
-/* */
-
-Rkns.Renderer.Edge = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.Edge.prototype._init = function() {
- this.renderer.edge_layer.activate();
- this.type = "Edge";
- this.from_representation = this.renderer.getRepresentationByModel(this.model.get("from"));
- this.to_representation = this.renderer.getRepresentationByModel(this.model.get("to"));
- this.bundle = this.renderer.addToBundles(this);
- this.line = new paper.Path();
- this.line.add([0,0],[0,0],[0,0]);
- this.line.__representation = this;
- this.line.strokeWidth = 2;
- this.arrow = new paper.Path();
- this.arrow.add([0,0],[Rkns.Renderer._ARROW_LENGTH,Rkns.Renderer._ARROW_WIDTH / 2],[0,Rkns.Renderer._ARROW_WIDTH]);
- this.arrow.__representation = this;
- this.text = new paper.PointText();
- this.text.characterStyle = {
- fontSize: Rkns.Renderer._EDGE_FONT_SIZE,
- fillColor: 'black'
- };
- this.text.paragraphStyle.justification = 'center';
- this.text_angle = 0;
- this.arrow_angle = 0;
- this.edit_button = new Rkns.Renderer.EdgeEditButton(this.renderer, null);
- this.edit_button.edge_representation = this;
- this.remove_button = new Rkns.Renderer.EdgeRemoveButton(this.renderer, null);
- this.remove_button.edge_representation = this;
-}
-
-Rkns.Renderer.Edge.prototype.redraw = function() {
- var _p0a = this.from_representation.paper_coords,
- _p1a = this.to_representation.paper_coords,
- _v = _p1a.subtract(_p0a),
- _r = _v.length,
- _u = _v.divide(_r),
- _group_pos = this.bundle.getPosition(this),
- _delta = new paper.Point([- _u.y, _u.x]).multiply( 12 * _group_pos ),
- _p0b = _p0a.add(_delta), /* Adding a 4 px difference */
- _p1b = _p1a.add(_delta), /* to differentiate inbound and outbound links */
- _a = _v.angle,
- _handle = _v.divide(3),
- _color = this.model.get("color") || this.model.get("color") || (this.model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color");
- this.paper_coords = _p0b.add(_p1b).divide(2);
- this.line.strokeColor = _color;
- this.line.segments[0].point = _p0a;
- this.line.segments[1].point = this.paper_coords;
- this.line.segments[1].handleIn = _handle.multiply(-1);
- this.line.segments[1].handleOut = _handle;
- this.line.segments[2].point = _p1a;
- this.arrow.rotate(_a - this.arrow_angle);
- this.arrow.fillColor = _color;
- this.arrow.position = this.paper_coords.subtract(_u.multiply(4));
- this.arrow_angle = _a;
- if (_a > 90) {
- _a -= 180;
- }
- if (_a < -90) {
- _a += 180;
- }
- this.text.rotate(_a - this.text_angle);
- this.text.content = this.model.get("title");
- this.text.position = this.paper_coords;
- this.text_angle = _a;
- this.edit_button.moveTo(this.paper_coords);
- this.remove_button.moveTo(this.paper_coords);
-}
-
-Rkns.Renderer.Edge.prototype.openEditor = function() {
- this.renderer.removeRepresentationsOfType("editor");
- var _editor = this.renderer.addRepresentation("EdgeEditor",null);
- _editor.edge_representation = this;
- _editor.draw();
-}
-
-Rkns.Renderer.Edge.prototype.select = function() {
- this.line.strokeWidth = 4;
- this.edit_button.show();
- this.remove_button.show();
-}
-
-Rkns.Renderer.Edge.prototype.unselect = function(_newTarget) {
- if (!_newTarget || _newTarget.edge_representation !== this) {
- this.edit_button.hide();
- this.remove_button.hide();
- this.line.strokeWidth = 2;
- }
-}
-
-Rkns.Renderer.Edge.prototype.mouseup = function(_event) {
- if (!this.renderer.is_dragging) {
- this.openEditor();
- }
- this.renderer.click_target = null;
- this.renderer.is_dragging = false;
-}
-
-Rkns.Renderer.Edge.prototype.paperShift = function(_delta) {
- this.from_representation.paperShift(_delta);
- this.to_representation.paperShift(_delta);
- this.renderer.redraw();
-}
-
-Rkns.Renderer.Edge.prototype.destroy = function() {
- this.super("destroy");
- this.line.remove();
- this.arrow.remove();
- this.text.remove();
- this.edit_button.destroy();
- this.remove_button.destroy();
- var _this = this;
- this.bundle.edges = Rkns._(this.bundle.edges).reject(function(_edge) {
- return _edge === _this;
- });
-}
-
-/* */
-
-Rkns.Renderer.TempEdge = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.TempEdge.prototype._init = function() {
- this.renderer.edge_layer.activate();
- this.type = "temp-edge";
-
- var _color = this.project.get("users").get(this.renderer.renkan.current_user).get("color") || "#000000";
- this.line = new paper.Path();
- this.line.strokeColor = _color;
- this.line.add([0,0],[0,0]);
- this.line.__representation = this;
- this.arrow = new paper.Path();
- this.arrow.fillColor = _color;
- this.arrow.add([0,0],[Rkns.Renderer._ARROW_LENGTH,Rkns.Renderer._ARROW_WIDTH / 2],[0,Rkns.Renderer._ARROW_WIDTH]);
- this.arrow.__representation = this;
- this.arrow_angle = 0;
-}
-
-Rkns.Renderer.TempEdge.prototype.redraw = function() {
- var _p0 = this.from_representation.paper_coords,
- _p1 = this.end_pos,
- _a = _p1.subtract(_p0).angle,
- _c = _p0.add(_p1).divide(2);
- this.line.segments[0].point = _p0;
- this.line.segments[1].point = _p1;
- this.arrow.rotate(_a - this.arrow_angle);
- this.arrow.position = _c;
- this.arrow_angle = _a;
-}
-
-Rkns.Renderer.TempEdge.prototype.paperShift = function(_delta) {
- this.end_pos = this.end_pos.add(_delta);
- var _hitResult = paper.project.hitTest(this.end_pos);
- this.renderer.findTarget(_hitResult);
- this.redraw();
-}
-
-Rkns.Renderer.TempEdge.prototype.mouseup = function(_event) {
- var _hitResult = paper.project.hitTest(_event.point),
- _model = this.from_representation.model,
- _endDrag = true;
- if (_hitResult && typeof _hitResult.item.__representation !== "undefined") {
- var _target = _hitResult.item.__representation;
- if (_target.type === "Node" && _model !== _target.model) {
- var _data = {
- id: Rkns.Utils.getUID('edge'),
- created_by: this.renderer.renkan.current_user,
- from: _model.get("_id"),
- to: _target.model.get("_id")
- };
- this.project.addEdge(_data);
- }
- if (_model === _target.model || (_target.node_representation && _target.node_representation.model === _model)) {
- _endDrag = false;
- this.renderer.is_dragging = true;
- }
- }
- if (_endDrag) {
- this.renderer.click_target = null;
- this.renderer.is_dragging = false;
- this.renderer.removeRepresentation(this);
- paper.view.draw();
- }
-}
-
-Rkns.Renderer.TempEdge.prototype.destroy = function() {
- this.arrow.remove();
- this.line.remove();
-}
-
-/* */
-
-Rkns.Renderer.NodeEditor = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.NodeEditor.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "editor";
- this.editor_block = new paper.Path();
- var _pts = Rkns._(Rkns._.range(8)).map(function() {return [0,0]});
- this.editor_block.add.apply(this.editor_block, _pts);
- this.editor_block.strokeWidth = 2;
- this.editor_block.strokeColor = "#999999";
- this.editor_block.fillColor = "#e0e0e0";
- this.editor_block.opacity = .8;
- this.editor_$ = Rkns.$('<div>')
- .appendTo(this.renderer.editor_$)
- .css({
- position: "absolute",
- opacity: .8
- })
- .hide();
-}
-
-Rkns.Renderer.NodeEditor.prototype.template = Rkns._.template(
- '<h2><span class="Rk-CloseX">×</span><%=l10n.edit_node%></span></h2>'
- + '<p><label><%=l10n.edit_title%></label><input class="Rk-Edit-Title" type="text" value="<%=node.title%>"/></p>'
- + '<p><label><%=l10n.edit_uri%></label><input class="Rk-Edit-URI" type="text" value="<%=node.uri%>"/><a class="Rk-Edit-Goto" href="<%=node.uri%>" target="_blank"></a></p>'
- + '<p><label><%=l10n.edit_description%></label><textarea class="Rk-Edit-Description"><%=node.description%></textarea></p>'
- + '<div class="Rk-Editor-p"><label>Node color</label><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%=node.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
- + '<% print(Rkns.pickerColors.reduce(function(m,c) { return m + "<li data-color=\'" + c + "\' style=\'background: " + c + "\'></li>"},"")); %></ul><span class="Rk-Edit-ColorPicker-Text">Choose color</span></div></div>'
- + '<p><label><%=l10n.edit_image%></label><input class="Rk-Edit-Image" type="text" value="<%=node.image%>"/><img class="Rk-Edit-ImgPreview" src="<%=node.image%>" /></p>'
- + '<p><label><%=l10n.created_by%></label> <span class="Rk-UserColor" style="background:<%=node.created_by_color%>;"></span><%=node.created_by_title%></p>'
-);
-
-Rkns.Renderer.NodeEditor.prototype.draw = function() {
- var _model = this.node_representation.model,
- _created_by = _model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER;
- this.editor_$
- .html(this.template({
- node: {
- title: _model.get("title"),
- uri: _model.get("uri"),
- description: _model.get("description"),
- image: _model.get("image") || "",
- color: _model.get("color") || _created_by.get("color"),
- created_by_color: _created_by.get("color"),
- created_by_title: _created_by.get("title")
- },
- l10n: this.renderer.renkan.l10n
- }));
- this.redraw();
- var _this = this;
- this.editor_$.find(".Rk-CloseX").click(function() {
- _this.renderer.removeRepresentation(_this);
- paper.view.draw();
- });
- this.editor_$.find("input, textarea").bind("keyup change", function() {
- var _uri = _this.editor_$.find(".Rk-Edit-URI").val(),
- _image = _this.editor_$.find(".Rk-Edit-Image").val();
- _this.editor_$.find(".Rk-Edit-ImgPreview").attr("src", _image);
- _this.editor_$.find(".Rk-Edit-Goto").attr("href",_uri);
- var _data = {
- title: _this.editor_$.find(".Rk-Edit-Title").val(),
- description: _this.editor_$.find(".Rk-Edit-Description").val(),
- uri: _uri,
- image: _image
- }
- _model.set(_data);
- _this.redraw();
- });
- this.editor_$.find("img").load(function() {
- _this.redraw();
- })
- this.editor_$.find(".Rk-Edit-Title")[0].focus();
- this.editor_$.find(".Rk-Edit-ColorPicker-Wrapper").hover(
- function() { _this.editor_$.find(".Rk-Edit-ColorPicker").show(); },
- function() { _this.editor_$.find(".Rk-Edit-ColorPicker").hide(); }
- );
- this.editor_$.find(".Rk-Edit-ColorPicker li").hover(
- function() { _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); },
- function() { _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color")) }
- ).click(function() {
- _model.set("color", $(this).attr("data-color"));
- _this.redraw();
- });
-}
-
-Rkns.Renderer.NodeEditor.prototype.redraw = function() {
- var _coords = this.node_representation.paper_coords;
- Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 20, this.editor_$);
- this.editor_$.show();
- paper.view.draw();
-}
-
-Rkns.Renderer.NodeEditor.prototype.destroy = function() {
- this.editor_block.remove();
- this.editor_$.detach();
-}
-
-/* */
-
-Rkns.Renderer.EdgeEditor = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.EdgeEditor.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "editor";
- this.editor_block = new paper.Path();
- var _pts = Rkns._(Rkns._.range(8)).map(function() {return [0,0]});
- this.editor_block.add.apply(this.editor_block, _pts);
- this.editor_block.strokeWidth = 2;
- this.editor_block.strokeColor = "#999999";
- this.editor_block.fillColor = "#e0e0e0";
- this.editor_block.opacity = .8;
- this.editor_$ = Rkns.$('<div>')
- .appendTo(this.renderer.editor_$)
- .css({
- position: "absolute",
- opacity: .8
- })
- .hide();
-}
-
-Rkns.Renderer.EdgeEditor.prototype.template = Rkns._.template(
- '<h2><span class="Rk-CloseX">×</span><%=l10n.edit_edge%></span></h2>'
- + '<p><label><%=l10n.edit_title%></label><input class="Rk-Edit-Title" type="text" value="<%=edge.title%>"/></p>'
- + '<p><label><%=l10n.edit_uri%></label><input class="Rk-Edit-URI" type="text" value="<%=edge.uri%>"/><a class="Rk-Edit-Goto" href="<%=edge.uri%>" target="_blank"></a></p>'
- + '<div class="Rk-Editor-p"><label>Edge color:</label><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%=edge.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
- + '<% print(Rkns.pickerColors.reduce(function(m,c) { return m + "<li data-color=\'" + c + "\' style=\'background: " + c + "\'></li>"},"")); %></ul><span class="Rk-Edit-ColorPicker-Text">Choose color</span></div></div>'
- + '<p><label><%=l10n.edit_from%></label><span class="Rk-UserColor" style="background:<%=edge.from_color%>;"></span><%=edge.from_title%></p>'
- + '<p><label><%=l10n.edit_to%></label><span class="Rk-UserColor" style="background:<%=edge.to_color%>;"></span><%=edge.to_title%></p>'
- + '<p><label><%=l10n.created_by%> </label><span class="Rk-UserColor" style="background:<%=edge.created_by_color%>;"></span><%=edge.created_by_title%></p>'
-);
-
-Rkns.Renderer.EdgeEditor.prototype.draw = function() {
- var _model = this.edge_representation.model,
- _from_model = _model.get("from"),
- _to_model = _model.get("to"),
- _created_by = _model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER;
- this.editor_$
- .html(this.template({
- edge: {
- title: _model.get("title"),
- uri: _model.get("uri"),
- description: _model.get("description"),
- color: _model.get("color") || _created_by.get("color"),
- from_title: _from_model.get("title"),
- to_title: _to_model.get("title"),
- from_color: _from_model.get("color") || (_from_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color"),
- to_color: _to_model.get("color") || (_to_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color"),
- created_by_color: _created_by.get("color"),
- created_by_title: _created_by.get("title")
- },
- l10n: this.renderer.renkan.l10n
- }));
- this.redraw();
- var _this = this;
- this.editor_$.find(".Rk-CloseX").click(function() {
- _this.renderer.removeRepresentation(_this);
- paper.view.draw();
- });
- this.editor_$.find("input, textarea").bind("keyup change", function() {
- _this.editor_$.find(".Rk-Edit-Goto").attr("href",_this.editor_$.find(".Rk-Edit-URI").val());
- var _data = {
- title: _this.editor_$.find(".Rk-Edit-Title").val(),
- uri: _this.editor_$.find(".Rk-Edit-URI").val()
- }
- _model.set(_data);
- _this.redraw();
- });
- this.editor_$.find(".Rk-Edit-ColorPicker-Wrapper").hover(
- function() { _this.editor_$.find(".Rk-Edit-ColorPicker").show(); },
- function() { _this.editor_$.find(".Rk-Edit-ColorPicker").hide(); }
- );
- this.editor_$.find(".Rk-Edit-ColorPicker li").hover(
- function() { _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); },
- function() { _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER).get("color")); }
- ).click(function() {
- _model.set("color", $(this).attr("data-color"));
- _this.redraw();
- });
-}
-Rkns.Renderer.EdgeEditor.prototype.redraw = function() {
- var _coords = this.edge_representation.paper_coords;
- Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 5, this.editor_$);
- this.editor_$.show();
- paper.view.draw();
-}
-
-Rkns.Renderer.EdgeEditor.prototype.destroy = function() {
- this.editor_block.remove();
- this.editor_$.detach();
-}
-
-/* */
-
-Rkns.Renderer.NodeEditButton = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.NodeEditButton.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "Node-edit-button";
- this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, - 90, 30, 1, this.renderer.renkan.static_url+'img/edit.png', this.renderer.renkan.l10n.caption_edit);
-}
-
-Rkns.Renderer.NodeEditButton.prototype.moveTo = function(_pos) {
- this.sector.moveTo(_pos);
-}
-
-Rkns.Renderer.NodeEditButton.prototype.show = function() {
- this.sector.show();
-}
-
-Rkns.Renderer.NodeEditButton.prototype.hide = function() {
- this.sector.hide();
-}
-
-Rkns.Renderer.NodeEditButton.prototype.select = function() {
- this.sector.select();
-}
-
-Rkns.Renderer.NodeEditButton.prototype.unselect = function(_newTarget) {
- this.sector.unselect();
- if (!_newTarget || (_newTarget !== this.node_representation && _newTarget.node_representation !== this.node_representation)) {
- this.node_representation.unselect();
- }
-}
-
-Rkns.Renderer.NodeEditButton.prototype.mouseup = function() {
- if (!this.renderer.is_dragging) {
- this.node_representation.openEditor();
- }
-}
-
-Rkns.Renderer.NodeEditButton.prototype.destroy = function() {
- this.sector.destroy();
-}
-
-/* */
-
-Rkns.Renderer.NodeRemoveButton = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.NodeRemoveButton.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "Node-remove-button";
- this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, -210, -90, 1, this.renderer.renkan.static_url+'img/remove.png', this.renderer.renkan.l10n.caption_remove);
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.moveTo = function(_pos) {
- this.sector.moveTo(_pos);
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.show = function() {
- this.sector.show();
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.hide = function() {
- this.sector.hide();
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.select = function() {
- this.sector.select();
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.unselect = function(_newTarget) {
- this.sector.unselect();
- if (!_newTarget || (_newTarget !== this.node_representation && _newTarget.node_representation !== this.node_representation)) {
- this.node_representation.unselect();
- }
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.mouseup = function() {
- this.renderer.removeRepresentationsOfType("editor");
- if (confirm('Do you really wish to remove node "' + this.node_representation.model.get("title") + '"?')) {
- this.project.removeNode(this.node_representation.model);
- }
-}
-
-Rkns.Renderer.NodeRemoveButton.prototype.destroy = function() {
- this.sector.destroy();
-}
-
-/* */
-
-Rkns.Renderer.NodeLinkButton = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.NodeLinkButton.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "Node-link-button";
- this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, 30, 150, 1, this.renderer.renkan.static_url+'img/link.png', this.renderer.renkan.l10n.caption_link);
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.moveTo = function(_pos) {
- this.sector.moveTo(_pos);
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.show = function() {
- this.sector.show();
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.hide = function() {
- this.sector.hide();
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.select = function() {
- this.sector.select();
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.unselect = function(_newTarget) {
- this.sector.unselect();
- if (!_newTarget || (_newTarget !== this.node_representation && _newTarget.node_representation !== this.node_representation)) {
- this.node_representation.unselect();
- }
-}
-
-Rkns.Renderer.NodeLinkButton.prototype.destroy = function() {
- this.sector.destroy();
-}
-
-/* */
-
-Rkns.Renderer.EdgeEditButton = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.EdgeEditButton.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "Edge-edit-button";
- this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 90, 90, 1, this.renderer.renkan.static_url+'img/edit.png', this.renderer.renkan.l10n.caption_edit);
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.moveTo = function(_pos) {
- this.sector.moveTo(_pos);
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.show = function() {
- this.sector.show();
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.hide = function() {
- this.sector.hide();
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.select = function() {
- this.sector.select();
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.unselect = function(_newTarget) {
- this.sector.unselect();
- if (!_newTarget || (_newTarget !== this.edge_representation && _newTarget.edge_representation !== this.edge_representation)) {
- this.edge_representation.unselect();
- }
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.mouseup = function() {
- if (!this.renderer.is_dragging) {
- this.edge_representation.openEditor();
- }
-}
-
-Rkns.Renderer.EdgeEditButton.prototype.destroy = function() {
- this.sector.destroy();
-}
-
-/* */
-
-Rkns.Renderer.EdgeRemoveButton = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.EdgeRemoveButton.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "Edge-remove-button";
- this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 270, -90, 1, this.renderer.renkan.static_url+'img/remove.png', this.renderer.renkan.l10n.caption_remove);
-}
-Rkns.Renderer.EdgeRemoveButton.prototype.moveTo = function(_pos) {
- this.sector.moveTo(_pos);
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.show = function() {
- this.sector.show();
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.hide = function() {
- this.sector.hide();
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.select = function() {
- this.sector.select();
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.unselect = function(_newTarget) {
- this.sector.unselect();
- if (!_newTarget || (_newTarget !== this.edge_representation && _newTarget.edge_representation !== this.edge_representation)) {
- this.edge_representation.unselect();
- }
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.mouseup = function() {
- this.renderer.removeRepresentationsOfType("editor");
- if (confirm('Do you really wish to remove edge "' + this.edge_representation.model.get("title") + '"?')) {
- this.project.removeEdge(this.edge_representation.model);
- }
-}
-
-Rkns.Renderer.EdgeRemoveButton.prototype.destroy = function() {
- this.sector.destroy();
-}
-
-/* */
-
-Rkns.Renderer.Scene = function(_renkan) {
- this.renkan = _renkan;
- this.$ = Rkns.$(".Rk-Render");
- this.representations = [];
- this.$.html(this.template(_renkan));
- this.canvas_$ = this.$.find(".Rk-Canvas");
- this.editor_$ = this.$.find(".Rk-Editor");
- this.notif_$ = this.$.find(".Rk-Notifications");
- paper.setup(this.canvas_$[0]);
- this.scale = 1;
- this.offset = paper.view.center;
- this.totalScroll = 0;
- this.click_target = null;
- this.selected_target = null;
- this.edge_layer = new paper.Layer();
- this.node_layer = new paper.Layer();
- this.overlay_layer = new paper.Layer();
- this.bundles = [];
- this.click_mode = false;
- var _tool = new paper.Tool(),
- _this = this;
- _tool.minDistance = Rkns.Renderer._MIN_DRAG_DISTANCE;
- _tool.onMouseMove = function(_event) {
- _this.onMouseMove(_event);
- }
- _tool.onMouseDown = function(_event) {
- _this.onMouseDown(_event);
- }
- _tool.onMouseDrag = function(_event) {
- _this.onMouseDrag(_event);
- }
- this.canvas_$.mouseup(function(_event) {
- _this.onMouseUp(_event);
- });
- this.canvas_$.mousewheel(function(_event, _delta) {
- _this.onScroll(_event, _delta);
- });
- this.canvas_$.dblclick(function(_event) {
- _this.onDoubleClick(_event);
- });
- this.canvas_$.mouseenter(function(_event) {
- _this.onMouseEnter(_event);
- });
- this.editor_$.find(".Rk-ZoomOut").click(function() {
- _this.offset = new paper.Point([
- _this.canvas_$.width(),
- _this.canvas_$.height()
- ]).multiply( .5 * ( 1 - Math.SQRT1_2 ) ).add(_this.offset.multiply( Math.SQRT1_2 ));
- _this.setScale( _this.scale * Math.SQRT1_2 );
- _this.redraw();
- });
- this.editor_$.find(".Rk-ZoomIn").click(function() {
- _this.offset = new paper.Point([
- _this.canvas_$.width(),
- _this.canvas_$.height()
- ]).multiply( .5 * ( 1 - Math.SQRT2 ) ).add(_this.offset.multiply( Math.SQRT2 ));
- _this.setScale( _this.scale * Math.SQRT2 );
- _this.redraw();
- });
- this.$.find(".Rk-CurrentUser").mouseenter(
- function() { _this.$.find(".Rk-UserList").slideDown() }
- );
- this.$.find(".Rk-Users").mouseleave(
- function() { _this.$.find(".Rk-UserList").slideUp(); }
- );
- this.$.find(".Rk-FullScreen-Button").click(function() {
- var _isFull = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen,
- _el = _this.renkan.$[0],
- _requestMethods = ["requestFullScreen","mozRequestFullScreen","webkitRequestFullScreen"],
- _cancelMethods = ["cancelFullScreen","mozCancelFullScreen","webkitCancelFullScreen"];
- if (_isFull) {
- for (var i = 0; i < _cancelMethods.length; i++) {
- if (typeof document[_cancelMethods[i]] === "function") {
- document[_cancelMethods[i]]();
- break;
- }
- }
- } else {
- for (var i = 0; i < _requestMethods.length; i++) {
- if (typeof _el[_requestMethods[i]] === "function") {
- _el[_requestMethods[i]]();
- break;
- }
- }
- }
- });
- this.$.find(".Rk-AddNode-Button").click(function() {
- if (_this.click_mode === Rkns.Renderer._CLICKMODE_ADDNODE) {
- _this.click_mode = false;
- _this.notif_$.hide();
- } else {
- _this.click_mode = Rkns.Renderer._CLICKMODE_ADDNODE;
- _this.notif_$.html(_renkan.l10n.notif_add_node).fadeIn();
- }
- });
- this.$.find(".Rk-AddEdge-Button").click(function() {
- if (_this.click_mode === Rkns.Renderer._CLICKMODE_STARTEDGE || _this.click_mode === Rkns.Renderer._CLICKMODE_ENDEDGE) {
- _this.click_mode = false;
- _this.notif_$.hide();
- } else {
- _this.click_mode = Rkns.Renderer._CLICKMODE_STARTEDGE;
- _this.notif_$.html(_renkan.l10n.notif_start_edge).fadeIn();
- }
- });
- this.$.find(".Rk-TopBar-Button").mouseover(function() {
- Rkns.$(this).find(".Rk-TopBar-Tooltip").show();
- }).mouseout(function() {
- Rkns.$(this).find(".Rk-TopBar-Tooltip").hide();
- });
-
- paper.view.onResize = function(_event) {
- _this.offset = _this.offset.add(_event.delta.divide(2));
- _this.redraw();
- }
-
- var _thRedraw = Rkns._.throttle(function() {
- _this.redraw();
- },50);
-
- this.addRepresentations("Node", this.renkan.project.get("nodes"));
- this.addRepresentations("Edge", this.renkan.project.get("edges"));
- this.renkan.project.on("change:title", function() {
- _this.$.find(".Rk-PadTitle").val(_renkan.project.get("title"));
- });
-
- this.$.find(".Rk-PadTitle").on("keyup input paste", function() {
- _renkan.project.set({"title": $(this).val()});
- })
-
- this.renkan.project.get("users").each(function(_user) {
- _this.addUser(_user);
- });
-
- this.renkan.project.on("add:users", function(_user) {
- _this.addUser(_user);
- });
- this.renkan.project.on("add:nodes", function(_node) {
- _this.addRepresentation("Node", _node);
- _thRedraw();
- });
- this.renkan.project.on("add:edges", function(_edge) {
- _this.addRepresentation("Edge", _edge);
- _thRedraw();
- });
-
- this.redraw();
-}
-
-Rkns.Renderer.Scene.prototype.template = Rkns._.template(
- '<div class="Rk-TopBar"><input type="text" class="Rk-PadTitle" value="<%- project.get("title") || "" %>" placeholder="<%=l10n.untitled_project%>" />'
- + '<div class="Rk-Users"><div class="Rk-CurrentUser"><span class="Rk-CurrentUser-Color"></span><span class="Rk-CurrentUser-Name"><unknown user></span></div><ul class="Rk-UserList"></ul></div>'
- + '<div class="Rk-TopBar-Separator"></div><div class="Rk-TopBar-Button Rk-FullScreen-Button"><div class="Rk-TopBar-Tooltip"><div class="Rk-TopBar-Tooltip-Tip"></div><div class="Rk-TopBar-Tooltip-Contents"><%=l10n.full_screen%></div></div></div>'
- + '<div class="Rk-TopBar-Separator"></div><div class="Rk-TopBar-Button Rk-AddNode-Button"><div class="Rk-TopBar-Tooltip"><div class="Rk-TopBar-Tooltip-Tip"></div><div class="Rk-TopBar-Tooltip-Contents"><%=l10n.add_node%></div></div></div>'
- + '<div class="Rk-TopBar-Separator"></div><div class="Rk-TopBar-Button Rk-AddEdge-Button"><div class="Rk-TopBar-Tooltip"><div class="Rk-TopBar-Tooltip-Tip"></div><div class="Rk-TopBar-Tooltip-Contents"><%=l10n.add_edge%></div></div></div>'
- + '<div class="Rk-TopBar-Separator"></div><div class="Rk-TopBar-Button Rk-Save-Button"><div class="Rk-TopBar-Tooltip"><div class="Rk-TopBar-Tooltip-Tip"></div><div class="Rk-TopBar-Tooltip-Contents"><%=l10n.save_project%></div></div></div>'
- + '<div class="Rk-TopBar-Separator"></div></div>'
- + '<canvas class="Rk-Canvas" resize></canvas><div class="Rk-Editor"><div class="Rk-Notifications"></div>'
- + '<div class="Rk-ZoomButtons"><div class="Rk-ZoomIn" title="<%=l10n.zoom_in%>"></div><div class="Rk-ZoomOut" title="<%=l10n.zoom_out%>"></div></div>'
- + '</div>'
-);
-
-Rkns.Renderer.Scene.prototype.addToBundles = function(_edgeRepr) {
- var _bundle = Rkns._(this.bundles).find(function(_bundle) {
- return (
- ( _bundle.from === _edgeRepr.from_representation && _bundle.to === _edgeRepr.to_representation )
- || ( _bundle.from === _edgeRepr.to_representation && _bundle.to === _edgeRepr.from_representation )
- );
- });
- if (typeof _bundle !== "undefined") {
- _bundle.edges.push(_edgeRepr)
- } else {
- _bundle = {
- from: _edgeRepr.from_representation,
- to: _edgeRepr.to_representation,
- edges: [ _edgeRepr ],
- getPosition: function(_er) {
- var _dir = (_er.from_representation === this.from) ? 1 : -1;
- return _dir * ( Rkns._(this.edges).indexOf(_er) - (this.edges.length - 1) / 2 );
- }
- }
- this.bundles.push(_bundle);
- }
- return _bundle;
-}
-
-Rkns.Renderer.Scene.prototype.setScale = function(_newScale) {
- this.scale = _newScale;
- this.redraw();
-}
-
-Rkns.Renderer.Scene.prototype.autoScale = function() {
- var nodes = this.renkan.project.get("nodes")
- if (nodes.length > 1) {
- var _xx = nodes.map(function(_node) { return _node.get("position").x }),
- _yy = nodes.map(function(_node) { return _node.get("position").y }),
- _minx = Math.min.apply(Math, _xx),
- _miny = Math.min.apply(Math, _yy),
- _maxx = Math.max.apply(Math, _xx),
- _maxy = Math.max.apply(Math, _yy);
- var _scale = Math.min((paper.view.size.width - 2 * Rkns.Renderer._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * Rkns.Renderer._MARGIN_Y) / (_maxy - _miny));
- this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale));
- this.setScale(_scale);
- }
- if (nodes.length === 1) {
- this.offset = paper.view.center.subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y]));
- this.setScale(1);
- }
-}
-
-Rkns.Renderer.Scene.prototype.toPaperCoords = function(_point) {
- return _point.multiply(this.scale).add(this.offset);
-}
-
-
-Rkns.Renderer.Scene.prototype.toModelCoords = function(_point) {
- return _point.subtract(this.offset).divide(this.scale);
-}
-
-Rkns.Renderer.Scene.prototype.addRepresentation = function(_type, _model) {
- var _repr = new Rkns.Renderer[_type](this, _model);
- this.representations.push(_repr);
- return _repr;
-}
-
-Rkns.Renderer.Scene.prototype.addRepresentations = function(_type, _collection) {
- var _this = this;
- _collection.forEach(function(_model) {
- _this.addRepresentation(_type, _model);
- });
-}
-
-Rkns.Renderer.Scene.prototype.userTemplate = Rkns._.template(
- '<li class="Rk-User"><span class="Rk-UserColor" style="background:<%=background%>;"></span><%=name%></li>'
-);
-
-Rkns.Renderer.Scene.prototype.addUser = function(_user) {
- if (_user.get("_id") === this.renkan.current_user) {
- this.$.find(".Rk-CurrentUser-Name").text(_user.get("title"));
- this.$.find(".Rk-CurrentUser-Color").css("background", _user.get("color"));
- } else {
- this.$.find(".Rk-UserList").append(
- Rkns.$(
- this.userTemplate({
- name: _user.get("title"),
- background: _user.get("color")
- })
- )
- );
- }
-}
-
-Rkns.Renderer.Scene.prototype.removeRepresentation = function(_representation) {
- _representation.destroy();
- this.representations = Rkns._(this.representations).reject(
- function(_repr) {
- return _repr == _representation
- }
- );
-}
-
-Rkns.Renderer.Scene.prototype.getRepresentationByModel = function(_model) {
- return Rkns._(this.representations).find(function(_repr) {
- return _repr.model === _model;
- });
-}
-
-Rkns.Renderer.Scene.prototype.removeRepresentationsOfType = function(_type) {
- var _representations = Rkns._(this.representations).filter(function(_repr) {
- return _repr.type == _type;
- }),
- _this = this;
- Rkns._(_representations).each(function(_repr) {
- _this.removeRepresentation(_repr);
- });
-}
-
-Rkns.Renderer.Scene.prototype.highlightModel = function(_model) {
- var _repr = this.getRepresentationByModel(_model);
- if (_repr) {
- _repr.highlight();
- }
-}
-
-Rkns.Renderer.Scene.prototype.unhighlightAll = function(_model) {
- Rkns._(this.representations).each(function(_repr) {
- _repr.unhighlight();
- });
-}
-
-Rkns.Renderer.Scene.prototype.redraw = function() {
- Rkns._(this.representations).each(function(_representation) {
- _representation.redraw();
- });
- paper.view.draw();
-}
-
-Rkns.Renderer.Scene.prototype.addTempEdge = function(_from, _point) {
- var _tmpEdge = this.addRepresentation("TempEdge",null);
- _tmpEdge.end_pos = _point;
- _tmpEdge.from_representation = _from;
- _tmpEdge.redraw();
- this.click_target = _tmpEdge;
-}
-
-Rkns.Renderer.Scene.prototype.findTarget = function(_hitResult) {
- if (_hitResult && typeof _hitResult.item.__representation !== "undefined") {
- var _newTarget = _hitResult.item.__representation;
- if (this.selected_target !== _hitResult.item.__representation) {
- if (this.selected_target) {
- this.selected_target.unselect(_newTarget);
- }
- _newTarget.select(this.selected_target);
- this.selected_target = _newTarget;
- }
- } else {
- if (this.selected_target) {
- this.selected_target.unselect(null);
- }
- this.selected_target = null;
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseMove = function(_event) {
- var _hitResult = paper.project.hitTest(_event.point);
- if (this.is_dragging) {
- if (this.click_target && typeof this.click_target.paperShift === "function") {
- this.click_target.paperShift(_event.delta);
- } else {
- this.offset = this.offset.add(_event.delta);
- this.redraw();
- }
- } else {
- this.findTarget(_hitResult);
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseDown = function(_event) {
- if (!this.click_target || this.click_target.type !== "temp-edge") {
- this.is_dragging = false;
- var _hitResult = paper.project.hitTest(_event.point);
- if (_hitResult && typeof _hitResult.item.__representation !== "undefined") {
- this.click_target = _hitResult.item.__representation;
- if (this.click_target.type === "Node-link-button") {
- this.removeRepresentationsOfType("editor");
- this.addTempEdge(this.click_target.node_representation, _event.point);
- }
- } else {
- this.click_target = null;
- if (this.click_mode === Rkns.Renderer._CLICKMODE_ADDNODE) {
- var _coords = this.toModelCoords(_event.point),
- _data = {
- id: Rkns.Utils.getUID('node'),
- created_by: this.renkan.current_user,
- position: {
- x: _coords.x,
- y: _coords.y
- }
- };
- _node = this.renkan.project.addNode(_data);
- this.getRepresentationByModel(_node).openEditor();
- }
- }
- }
- if (this.click_mode) {
- if (this.click_mode === Rkns.Renderer._CLICKMODE_STARTEDGE && this.click_target && this.click_target.type === "Node") {
- this.removeRepresentationsOfType("editor");
- this.addTempEdge(this.click_target, _event.point);
- this.click_mode = Rkns.Renderer._CLICKMODE_ENDEDGE;
- this.notif_$.fadeOut(function() {
- Rkns.$(this).html(_renkan.l10n.notif_end_edge).fadeIn();
- });
- } else {
- this.notif_$.hide();
- this.click_mode = false;
- }
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseDrag = function(_event) {
- this.is_dragging = true;
- this.onMouseMove(_event);
-}
-
-Rkns.Renderer.Scene.prototype.onMouseUp = function(_event) {
- if (this.click_target) {
- var _off = this.canvas_$.offset();
- this.click_target.mouseup(
- {
- point: new paper.Point([
- _event.pageX - _off.left,
- _event.pageY - _off.top
- ])
- }
- );
- } else {
- this.click_target = null;
- this.is_dragging = false;
- }
-}
-
-Rkns.Renderer.Scene.prototype.onScroll = function(_event, _scrolldelta) {
- this.totalScroll += _scrolldelta;
- if (Math.abs(this.totalScroll) >= 1) {
- var _off = this.canvas_$.offset(),
- _delta = new paper.Point([
- _event.pageX - _off.left,
- _event.pageY - _off.top
- ]).subtract(this.offset).multiply( Math.SQRT2 - 1 );
- if (this.totalScroll > 0) {
- this.offset = this.offset.subtract(_delta);
- this.setScale( this.scale * Math.SQRT2 );
- } else {
- this.offset = this.offset.add(_delta.divide( Math.SQRT2 ));
- this.setScale( this.scale * Math.SQRT1_2);
- }
- this.totalScroll = 0;
- this.redraw();
- }
-}
-
-Rkns.Renderer.Scene.prototype.onDoubleClick = function(_event) {
- var _off = this.canvas_$.offset(),
- _point = new paper.Point([
- _event.pageX - _off.left,
- _event.pageY - _off.top
- ]);
- var _hitResult = paper.project.hitTest(_point);
- if (!_hitResult || typeof _hitResult.item.__representation === "undefined") {
- var _coords = this.toModelCoords(_point),
- _data = {
- id: Rkns.Utils.getUID('node'),
- created_by: this.renkan.current_user,
- position: {
- x: _coords.x,
- y: _coords.y
- }
- };
- _node = this.renkan.project.addNode(_data);
- this.getRepresentationByModel(_node).openEditor();
- }
- paper.view.draw();
-}
-
-Rkns.Renderer.Scene.prototype.onMouseEnter = function(_event) {
- var _newEl = this.renkan.selected_bin_item;
- if (_newEl) {
- var _off = this.canvas_$.offset(),
- _point = new paper.Point([
- _event.pageX - _off.left,
- _event.pageY - _off.top
- ]),
- _coords = this.toModelCoords(_point),
- _data = {
- id: Rkns.Utils.getUID('node'),
- created_by: this.renkan.current_user,
- uri: _newEl.uri,
- title: _newEl.title,
- description: _newEl.description,
- image: _newEl.image,
- position: {
- x: _coords.x,
- y: _coords.y
- }
- };
- var _node = this.renkan.project.addNode(_data);
- this.renkan.selected_bin_item = null;
- this.is_dragging = true;
- this.click_target = this.getRepresentationByModel(_node);
- }
-}
\ No newline at end of file
--- a/server/src/main/webapp/static/js/random-data.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-Rkns.randomData = function(_renkan, _opts) {
- _opts = _opts || {};
- _opts.user_count = _opts.user_count || 5;
- _opts.node_count = _opts.node_count || 20;
- _opts.edge_count = _opts.edge_count || 2 * _opts.node_count;
- _opts.user_colors = _opts.user_colors || ["#ff0000", "#008000", "#0000ff", "#808000", "#808080", "#c000c0", "#00c0c0"];
- var _proj = _renkan.project
- for (var i = 0; i < _opts.user_count; i++) {
- _proj.addUser({
- id: "user-"+i,
- title: "User #"+(1+i),
- color: _opts.user_colors[i]
- });
- }
- for (var i = 0; i < _opts.node_count; i++) {
- _proj.addNode({
- id: "node-"+i,
- title: "Node #"+(1+i),
- created_by: "user-" + Math.floor(_opts.user_count*Math.random()),
- position: {
- x: 300 * Math.cos(2 * Math.PI * i / _opts.node_count),
- y: 300 * Math.sin(2 * Math.PI * i / _opts.node_count)
- }
- });
- }
- for (var i = 0; i < _opts.node_count; i++) {
- var _from, _to;
- _from = _to = Math.floor(_opts.node_count*Math.random());
- while(_from === _to) {
- _to = Math.floor(_opts.node_count*Math.random());
- }
- _proj.addEdge({
- id: "edge-"+i,
- title: "Edge #"+(1+i),
- created_by: "user-" + Math.floor(_opts.user_count*Math.random()),
- from: "node-" + _from,
- to: "node-" + _to
- });
- }
- _renkan.current_user = "user-0";
- _renkan.renderer.autoScale();
-}
--- a/server/src/main/webapp/static/js/renkan-publish.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1085 +0,0 @@
-/*
- * Copyright 2012 Institut de recherche et d'innovation
- * contributor(s) : Yves-Marie Haussonne, Raphael Velt, Samuel Huron
- *
- * contact@iri.centrepompidou.fr
- * http://www.iri.centrepompidou.fr
- *
- * This software is a computer program whose purpose is to show and add annotations on a video .
- * This software is governed by the CeCILL-C license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL-C
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL-C license and that you accept its terms.
-*/
-
-if (typeof Rkns !== "object") {
- Rkns = {}
-}
-
-Rkns.$ = jQuery;
-
-Rkns._ = _;
-
-Rkns.i18n = {
- en: {
- zoom_in: "Zoom In",
- zoom_out: "Zoom Out",
- see_in_project: 'See also <b>"{node}"</b> in <b>"{project}"</b>'
- }
-}
-
-Rkns.Utils = {
- inherit : function(_baseClass) {
- var _class = function() {
- _baseClass.apply(this, Array.prototype.slice.call(arguments, 0));
- if (typeof this._init == "function") {
- this._init.apply(this, Array.prototype.slice.call(arguments, 0));
- }
- }
- _class.prototype = new _baseClass();
- return _class;
- }
-}
-
-Rkns.Models = {};
-
-Rkns.Models.getUID = function(obj) {
- var guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
- return v.toString(16);
- });
- return obj.type + "-" + guid;
-};
-
-Rkns.Models.RenkanModel = Backbone.RelationalModel.extend({
- idAttribute : "_id",
- constructor: function(options) {
-
- if (typeof options !== "undefined") {
- options._id = options._id || options.id || Rkns.Models.getUID(this);
- options.title = options.title || "(untitled " + this.type + ")";
- options.description = options.description || "";
- options.uri = options.uri || "";
-
- if(typeof this.prepare === "function") {
- options = this.prepare(options);
- }
- }
- Backbone.RelationalModel.prototype.constructor.call(this, options);
- },
- validate: function() {
- if(!this.type) {
- return "object has no type";
- }
- },
- addReference : function(_options, _propName, _list, _id, _default) {
- var _element = _list.get(_id);
- if (typeof _element === "undefined" && typeof _default !== "undefined") {
- _options[_propName ] = _default;
- }
- else {
- _options[_propName ] = _element;
- }
- }
-});
-
-// USER
-Rkns.Models.User = Rkns.Models.RenkanModel.extend({
- type: "user",
- prepare: function(options) {
- options.color = options.color || "#666666";
- return options;
- },
- toJSON: function() {
- return {
- id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- color: this.get("color"),
- }
- },
-});
-
-// NODE
-Rkns.Models.Node = Rkns.Models.RenkanModel.extend({
- type: "node",
- relations: [{
- type: Backbone.HasOne,
- key: "created_by",
- relatedModel: Rkns.Models.User
- }],
- prepare: function(options) {
- project = options.project;
- this.addReference(options, "created_by", project.get("users"), options.created_by, project.current_user);
- options.description = options.description || "";
- return options;
- },
- toJSON: function() {
- return {
- id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- position: this.get("position"),
- image: this.get("image"),
- created_by: this.get("created_by").get("_id")
- }
- },
-});
-
-// EDGE
-Rkns.Models.Edge = Rkns.Models.RenkanModel.extend({
- type: "edge",
- relations: [
- {
- type: Backbone.HasOne,
- key: "created_by",
- relatedModel: Rkns.Models.User
- },
- {
- type: Backbone.HasOne,
- key: "from",
- relatedModel: Rkns.Models.Node
- },
- {
- type: Backbone.HasOne,
- key: "to",
- relatedModel: Rkns.Models.Node
- },
- ],
- prepare: function(options) {
- project = options.project;
- this.addReference(options, "created_by", project.get("users"), options.created_by, project.current_user);
- this.addReference(options, "from", project.get("nodes"), options.from);
- this.addReference(options, "to", project.get("nodes"), options.to);
- return options;
- },
- toJSON: function() {
- return {
- id: this.get("_id"),
- title: this.get("title"),
- uri: this.get("uri"),
- description: this.get("description"),
- from: this.get("from").get("_id"),
- to: this.get("to").get("_id"),
- created_by: this.get("created_by").get("_id"),
- }
- },
-});
-
-// PROJECT
-Rkns.Models.Project = Rkns.Models.RenkanModel.extend({
- type: "project",
- relations: [
- {
- type: Backbone.HasMany,
- key: "users",
- relatedModel: Rkns.Models.User,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- },
- {
- type: Backbone.HasMany,
- key: "nodes",
- relatedModel: Rkns.Models.Node,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- },
- {
- type: Backbone.HasMany,
- key: "edges",
- relatedModel: Rkns.Models.Edge,
- reverseRelation: {
- key: 'project',
- includeInJSON: '_id'
- },
- }
- ],
- addUser: function(_props) {
- _props.project = this;
- var _user = new Rkns.Models.User(_props);
- this.get("users").push(_user);
- return _user;
- },
- addNode: function(_props) {
- _props.project = this;
- var _node = new Rkns.Models.Node(_props);
- this.get("nodes").push(_node);
- return _node;
- },
- addEdge: function(_props) {
- _props.project = this;
- var _edge = new Rkns.Models.Edge(_props);
- this.get("edges").push(_edge);
- return _edge;
- },
- removeNode: function(_model) {
- this.get("nodes").remove(_model);
- },
- removeEdge: function(_model) {
- this.get("edges").remove(_model);
- },
- validate: function(options) {
- var _project = this;
- Rkns._(options.users).each(function(_item) {
- _item.project = _project;
- });
- Rkns._(options.nodes).each(function(_item) {
- _item.project = _project;
- });
- Rkns._(options.edges).each(function(_item) {
- _item.project = _project;
- });
- },
- // Add event handler to remove edges when a node is removed
- initialize: function() {
- var _this = this;
- this.on("remove:nodes", function(_node) {
- _this.get("edges").remove(
- _this.get("edges").filter(function(_edge) {
- return _edge.get("from") == _node || _edge.get("to") == _node;
- })
- );
- });
- }
-});
-
-/* Point of entry */
-
-Rkns.Renkan = function(_opts) {
- if (typeof _opts.language !== "string" || typeof Rkns.i18n[_opts.language] == "undefined") {
- _opts.language = "en";
- }
- if (typeof _opts.container !== "string") {
- _opts.container = "renkan";
- }
- if (typeof _opts.search !== "object" || !_opts.search) {
- _opts.search = [];
- }
- this.projects = [];
- this.l10n = Rkns.i18n[_opts.language];
- this.$ = Rkns.$("#" + _opts.container);
- this.$.html(this.template());
- this.uris = {};
- this.active_project = null;
- this.renderer = null;
-}
-
-Rkns.Renkan.prototype.template = Rkns._.template(
- '<div class="Rk-Render"></div><ul class="Rk-Project-List"></ul>'
-);
-
-Rkns.Renkan.prototype.addProject = function(_opts) {
- var _proj = new Rkns.Models.Project(),
- _li = Rkns.$("<li>").addClass("Rk-Project").text("Untitled #" + (1+this.projects.length));
- this.$.find(".Rk-Project-List").append(_li);
- Rkns.loadJson(_proj, _opts);
- var _this = this;
- _li.click(function() {
- _this.renderProject(_proj);
- });
- _proj.on("change:title", function() {
- _li.html(_proj.get("title"));
- });
- _proj.on("select", function() {
- _this.$.find(".Rk-Project").removeClass("active");
- _li.addClass("active");
- });
- _proj.on("add:nodes", function(_node) {
- var _uri = _node.get("uri");
- if (_uri) {
- if (typeof _this.uris[_uri] === "undefined") {
- _this.uris[_uri] = [];
- }
- _this.uris[_uri].push(_node);
- }
- });
- this.projects.push(_proj);
- return _proj;
-}
-
-Rkns.Renkan.prototype.renderProject = function(_project) {
- if (_project) {
- if (this.renderer) {
- this.renderer.destroy();
- }
- this.active_project = _project;
- this.renderer = new Rkns.Renderer.Scene(this, _project);
- this.renderer.autoScale();
- _project.trigger("select");
- }
-}
-
-Rkns.Renkan.prototype.renderProjectAt = function(_index) {
- this.renderProject(this.projects[_index]);
-}
-
-Rkns.loadJson = function(_proj, _opts) {
- if (typeof _opts.http_method == "undefined") {
- _opts.http_method = 'PUT';
- }
- var _load = function() {
- Rkns.$.getJSON(_opts.url, function(_data) {
- _proj.set(_data);
- if (typeof _opts.callback === "function") {
- _opts.callback(_proj);
- }
- });
- }
- _load();
-}
-
-Rkns.Renderer = {
- _MARGIN_X: 80,
- _MARGIN_Y: 50,
- _MIN_DRAG_DISTANCE: 2,
- _NODE_RADIUS: 20,
- _NODE_FONT_SIZE: 10,
- _EDGE_FONT_SIZE: 9,
- _NODE_MAX_CHAR: 30,
- _EDGE_MAX_CHAR: 20,
- _ARROW_LENGTH: 16,
- _ARROW_WIDTH: 8,
- _TOOLTIP_ARROW_LENGTH : 15,
- _TOOLTIP_ARROW_WIDTH : 26,
- _TOOLTIP_MARGIN : 10,
- _TOOLTIP_PADDING : 8,
- _TOOLTIP_GRADIENT : new paper.Gradient(['#f0f0f0', '#d0d0d0'])
-}
-
-Rkns.Renderer.Utils = {
- shortenText : function(_text,_length) {
- var _rgxp = new RegExp('^(.{' + _length + '}).+$');
- return _text.replace(/(\n|\r|\r\n)/mg,' ').replace(_rgxp,'$1…');
- },
- drawTooltip : function(_coords, _path, _width, _xmargin, _selector) {
- _selector.css({
- width: (_width - 2* Rkns.Renderer._TOOLTIP_PADDING),
- });
- var _height = _selector.outerHeight() + 2* Rkns.Renderer._TOOLTIP_PADDING,
- _isLeft = (_coords.x < paper.view.center.x ? 1 : -1),
- _left = _coords.x + _isLeft * ( _xmargin + Rkns.Renderer._TOOLTIP_ARROW_LENGTH ),
- _right = _coords.x + _isLeft * ( _xmargin + Rkns.Renderer._TOOLTIP_ARROW_LENGTH + _width ),
- _top = _coords.y - _height / 2;
- if (_top < Rkns.Renderer._TOOLTIP_MARGIN) {
- _top = Math.min( Rkns.Renderer._TOOLTIP_MARGIN, _coords.y - Rkns.Renderer._TOOLTIP_ARROW_WIDTH / 2 );
- }
- var _bottom = _top + _height;
- if (_bottom > (paper.view.size.height - Rkns.Renderer._TOOLTIP_MARGIN)) {
- _bottom = Math.max( paper.view.size.height - Rkns.Renderer._TOOLTIP_MARGIN, _coords.y + Rkns.Renderer._TOOLTIP_ARROW_WIDTH / 2 );
- _top = _bottom - _height;
- }
- _path.segments[0].point
- = _path.segments[7].point
- = _coords.add([_isLeft * _xmargin, 0]);
- _path.segments[1].point.x
- = _path.segments[2].point.x
- = _path.segments[5].point.x
- = _path.segments[6].point.x
- = _left;
- _path.segments[3].point.x
- = _path.segments[4].point.x
- = _right;
- _path.segments[2].point.y
- = _path.segments[3].point.y
- = _top;
- _path.segments[4].point.y
- = _path.segments[5].point.y
- = _bottom;
- _path.segments[1].point.y = _coords.y - Rkns.Renderer._TOOLTIP_ARROW_WIDTH / 2;
- _path.segments[6].point.y = _coords.y + Rkns.Renderer._TOOLTIP_ARROW_WIDTH / 2;
- _path.closed = true;
- _path.fillColor = new paper.GradientColor(Rkns.Renderer._TOOLTIP_GRADIENT, [0,_top], [0, _bottom]);
- _selector.css({
- left: (Rkns.Renderer._TOOLTIP_PADDING + Math.min(_left, _right)),
- top: (Rkns.Renderer._TOOLTIP_PADDING + _top)
- });
- }
-}
-
-Rkns.Renderer._BaseRepresentation = function(_renderer, _model) {
- if (typeof _renderer !== "undefined") {
- this.renderer = _renderer;
- this.project = _renderer.project;
- this.model = _model;
- if (this.model) {
- var _this = this;
- this._selectBinding = function() {
- _this.select();
- };
- this._unselectBinding = function() {
- _this.unselect();
- }
- this._changeBinding = function() {
- _this.redraw();
- }
- this._removeBinding = function() {
- _renderer.removeRepresentation(_this);
- _renderer.redraw();
- }
- this.model.on("change", this._changeBinding );
- this.model.on("remove", this._removeBinding );
- this.model.on("select", this._selectBinding );
- this.model.on("unselect", this._unselectBinding );
- }
- }
-}
-
-Rkns.Renderer._BaseRepresentation.prototype.super = function(_func) {
- Rkns.Renderer._BaseRepresentation.prototype[_func].apply(this, Array.prototype.slice.call(arguments, 1));
-}
-
-Rkns.Renderer._BaseRepresentation.prototype.select = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.unselect = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.mouseup = function() {}
-
-Rkns.Renderer._BaseRepresentation.prototype.destroy = function() {
- if (this.model) {
- this.model.off("change", this._changeBinding );
- this.model.off("remove", this._removeBinding );
- this.model.off("select", this._selectBinding);
- this.model.off("unselect", this._unselectBinding);
- }
-}
-
-Rkns.Renderer.Node = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.Node.prototype._init = function() {
- this.renderer.node_layer.activate();
- this.type = "Node";
- this.circle = new paper.Path.Circle([0, 0], Rkns.Renderer._NODE_RADIUS);
- this.circle.fillColor = '#ffffff';
- this.circle.__representation = this;
- this.title = new paper.PointText([0,0]);
- this.title.characterStyle = {
- fontSize: Rkns.Renderer._NODE_FONT_SIZE,
- fillColor: 'black'
- };
- this.title.paragraphStyle.justification = 'center';
- this.title.__representation = this;
- this.model_coords = new paper.Point(this.model.get("position"));
-}
-
-Rkns.Renderer.Node.prototype.redraw = function() {
- this.paper_coords = this.renderer.toPaperCoords(this.model_coords);
- this.circle.position = this.paper_coords;
- this.title.content = Rkns.Renderer.Utils.shortenText(this.model.get("title"), Rkns.Renderer._NODE_MAX_CHAR);
- this.title.position = this.paper_coords.add([0, 2 * Rkns.Renderer._NODE_RADIUS]);
- this.circle.strokeColor = this.model.get("created_by").get("color");
- var _img = this.model.get("image");
- if (_img && _img !== this.img) {
- var _image = new Image(),
- _this = this;
- _image.onload = function() {
- if (_this.node_image) {
- _this.node_image.remove();
- }
- _this.renderer.node_layer.activate();
- var _ratio = Math.min(1, 2 * Rkns.Renderer._NODE_RADIUS / _image.width, 2 * Rkns.Renderer._NODE_RADIUS / _image.height );
- var _raster = new paper.Raster(_image);
- var _clip = new paper.Path.Circle([0, 0], Rkns.Renderer._NODE_RADIUS);
- _raster.scale(_ratio);
- _this.node_image = new paper.Group(_clip, _raster);
- _this.node_image.opacity = _this.selected ? .5 : .9;
- /* This is a workaround to allow clipping at group level */
- _this.node_image.clipped = true;
- _this.node_image.position = _this.paper_coords;
- _this.node_image.__representation = _this;
- paper.view.draw();
- }
- _image.src = _img;
- }
- this.img = _img;
- if (this.node_image) {
- if (!this.img) {
- this.node_image.remove();
- delete this.node_image;
- } else {
- this.node_image.position = this.paper_coords;
- }
- }
-}
-
-Rkns.Renderer.Node.prototype.paperShift = function(_delta) {
- this.paper_coords = this.paper_coords.add(_delta);
- this.model_coords = this.renderer.toModelCoords(this.paper_coords);
- this.renderer.redraw();
-}
-
-Rkns.Renderer.Node.prototype.openTooltip = function() {
- this.renderer.removeRepresentationsOfType("tooltip");
- var _tooltip = this.renderer.addRepresentation("NodeTooltip",null);
- _tooltip.node_representation = this;
- _tooltip.draw();
-}
-
-Rkns.Renderer.Node.prototype.select = function() {
- this.selected = true;
- this.circle.strokeWidth = 3;
- this.openTooltip();
- this.circle.fillColor = "#ffff80";
- if (this.node_image) {
- this.node_image.opacity = .5;
- }
- paper.view.draw();
-}
-
-Rkns.Renderer.Node.prototype.unselect = function() {
- this.selected = false;
- this.circle.strokeWidth = 1;
- this.circle.fillColor = "#ffffff";
- if (this.node_image) {
- this.node_image.opacity = .9;
- }
- paper.view.draw();
-}
-
-Rkns.Renderer.Node.prototype.mouseup = function(_event) {
-}
-
-Rkns.Renderer.Node.prototype.destroy = function(_event) {
- this.super("destroy");
- this.circle.remove();
- this.title.remove();
- if (this.node_image) {
- this.node_image.remove();
- }
-}
-
-/* */
-
-Rkns.Renderer.Edge = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.Edge.prototype._init = function() {
- this.renderer.edge_layer.activate();
- this.type = "Edge";
- this.from_representation = this.renderer.getRepresentationByModel(this.model.get("from"));
- this.to_representation = this.renderer.getRepresentationByModel(this.model.get("to"));
- this.bundle = this.renderer.addToBundles(this);
- this.line = new paper.Path();
- this.line.add([0,0],[0,0],[0,0]);
- this.line.__representation = this;
- this.arrow = new paper.Path();
- this.arrow.add([0,0],[Rkns.Renderer._ARROW_LENGTH,Rkns.Renderer._ARROW_WIDTH / 2],[0,Rkns.Renderer._ARROW_WIDTH]);
- this.arrow.__representation = this;
- this.text = new paper.PointText();
- this.text.characterStyle = {
- fontSize: Rkns.Renderer._EDGE_FONT_SIZE,
- fillColor: 'black'
- };
- this.text.paragraphStyle.justification = 'center';
- this.text.__representation = this;
- this.text_angle = 0;
- this.arrow_angle = 0;
-}
-
-Rkns.Renderer.Edge.prototype.redraw = function() {
- var _p0a = this.from_representation.paper_coords,
- _p1a = this.to_representation.paper_coords,
- _v = _p1a.subtract(_p0a),
- _r = _v.length,
- _u = _v.divide(_r),
- _group_pos = this.bundle.getPosition(this),
- _delta = new paper.Point([- _u.y, _u.x]).multiply( 12 * _group_pos ),
- _p0b = _p0a.add(_delta), /* Adding a 4 px difference */
- _p1b = _p1a.add(_delta), /* to differentiate inbound and outbound links */
- _a = _v.angle,
- _handle = _v.divide(3),
- _color = this.model.get("created_by").get("color");
- this.paper_coords = _p0b.add(_p1b).divide(2);
- this.line.strokeColor = _color;
- this.line.segments[0].point = _p0a;
- this.line.segments[1].point = this.paper_coords;
- this.line.segments[1].handleIn = _handle.multiply(-1);
- this.line.segments[1].handleOut = _handle;
- this.line.segments[2].point = _p1a;
- this.arrow.rotate(_a - this.arrow_angle);
- this.arrow.fillColor = _color;
- this.arrow.position = this.paper_coords.subtract(_u.multiply(4));
- this.arrow_angle = _a;
- if (_a > 90) {
- _a -= 180;
- }
- if (_a < -90) {
- _a += 180;
- }
- this.text.rotate(_a - this.text_angle);
- this.text.content = Rkns.Renderer.Utils.shortenText(this.model.get("title"), Rkns.Renderer._EDGE_MAX_CHAR);
- this.text.position = this.paper_coords;
- this.text_angle = _a;
-}
-
-Rkns.Renderer.Edge.prototype.openTooltip = function() {
- this.renderer.removeRepresentationsOfType("tooltip");
- var _tooltip = this.renderer.addRepresentation("EdgeTooltip",null);
- _tooltip.edge_representation = this;
- _tooltip.draw();
-}
-
-Rkns.Renderer.Edge.prototype.select = function() {
- this.line.strokeWidth = 3;
- this.openTooltip();
- paper.view.draw();
-}
-
-Rkns.Renderer.Edge.prototype.unselect = function() {
- this.line.strokeWidth = 1;
- paper.view.draw();
-}
-
-Rkns.Renderer.Edge.prototype.mouseup = function(_event) {
-}
-
-Rkns.Renderer.Edge.prototype.paperShift = function(_delta) {
- this.from_representation.paperShift(_delta);
- this.to_representation.paperShift(_delta);
- this.renderer.redraw();
-}
-
-Rkns.Renderer.Edge.prototype.destroy = function() {
- this.super("destroy");
- this.line.remove();
- this.arrow.remove();
- this.text.remove();
- var _this = this;
- this.bundle.edges = Rkns._(this.bundle.edges).reject(function(_edge) {
- return _edge === _this;
- });
-}
-
-/* */
-
-Rkns.Renderer.NodeTooltip = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.NodeTooltip.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "tooltip";
- this.tooltip_block = new paper.Path();
- var _pts = Rkns._(Rkns._.range(8)).map(function() {return [0,0]});
- this.tooltip_block.add.apply(this.tooltip_block, _pts);
- this.tooltip_block.strokeWidth = 2;
- this.tooltip_block.strokeColor = "#999999";
- this.tooltip_block.fillColor = "#e0e0e0";
- this.tooltip_block.opacity = .8;
- this.tooltip_$ = Rkns.$('<div>')
- .appendTo(this.renderer.tooltip_$)
- .css({
- position: "absolute",
- opacity: .8
- })
- .hide();
-}
-
-Rkns.Renderer.NodeTooltip.prototype.template = Rkns._.template(
- '<h2><span class="Rk-CloseX">×</span><%=a%></h2>'
- + '<p><%-description%></p>'
- + '<ul class="Rk-Related-List"></ul>'
-);
-
-Rkns.Renderer.NodeTooltip.prototype.draw = function() {
- var _model = this.node_representation.model,
- _title = _model.get("title"),
- _uri = _model.get("uri");
- this.tooltip_$
- .html(this.template({
- a: (_uri ? '<a href="' + _uri + '" target="_blank">' : '' ) + _title + (_uri ? '</a>' : '' ),
- description: _model.get("description").replace(/(\n|\r|\r\n)/mg,' ').substr(0,180).replace(/(^.{150,179})[\s].+$/m,'$1…')
- }))
- var _this = this,
- _renkan = this.renderer.renkan,
- _uris = _renkan.uris[_uri];
- Rkns._(_uris).each(function(_othernode) {
- if (_othernode !== _model && _othernode.get("project") !== _this.project) {
- var _otherproj = _othernode.get("project"),
- _nodetitle = _othernode.get("title") || "Untitled node"
- _projtitle = _otherproj.get("title") || "Untitled node",
- _html = _renkan.l10n.see_in_project.replace('{node}',Rkns._.escape(_nodetitle)).replace('{project}',Rkns._.escape(_projtitle)),
- _li = Rkns.$("<li>").addClass("Rk-Related").html(_html);
- _li.click(function() {
- _renkan.renderProject(_otherproj);
- Rkns._.defer(function() {
- _othernode.trigger("select");
- });
- });
- _this.tooltip_$.append(_li);
- }
- });
- this.tooltip_$.find(".Rk-CloseX").click(function() {
- _this.renderer.removeRepresentation(_this);
- paper.view.draw();
- });
- this.redraw();
-}
-
-Rkns.Renderer.NodeTooltip.prototype.redraw = function() {
- var _coords = this.node_representation.paper_coords;
- Rkns.Renderer.Utils.drawTooltip(_coords, this.tooltip_block, 250, 15, this.tooltip_$);
- this.tooltip_$.show();
-}
-
-Rkns.Renderer.NodeTooltip.prototype.destroy = function() {
- this.tooltip_block.remove();
- this.tooltip_$.detach();
-}
-
-/* */
-
-Rkns.Renderer.EdgeTooltip = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation);
-
-Rkns.Renderer.EdgeTooltip.prototype._init = function() {
- this.renderer.overlay_layer.activate();
- this.type = "tooltip";
- this.tooltip_block = new paper.Path();
- var _pts = Rkns._(Rkns._.range(8)).map(function() {return [0,0]});
- this.tooltip_block.add.apply(this.tooltip_block, _pts);
- this.tooltip_block.strokeWidth = 2;
- this.tooltip_block.strokeColor = "#999999";
- this.tooltip_block.fillColor = "#e0e0e0";
- this.tooltip_block.opacity = .8;
- this.tooltip_$ = Rkns.$('<div>')
- .appendTo(this.renderer.tooltip_$)
- .css({
- position: "absolute",
- opacity: .8
- })
- .hide();
-}
-
-Rkns.Renderer.EdgeTooltip.prototype.template = Rkns._.template(
- '<h2><span class="Rk-CloseX">×</span><%=a%></h2>'
- + '<p><%-description%></p>'
-);
-
-Rkns.Renderer.EdgeTooltip.prototype.draw = function() {
- var _model = this.edge_representation.model,
- _title = _model.get("title"),
- _uri = _model.get("uri");
- this.tooltip_$
- .html(this.template({
- a: (_uri ? '<a href="' + _uri + '" target="_blank">' : '' ) + _title + (_uri ? '</a>' : '' ),
- description: _model.get("description").replace(/(\n|\r|\r\n)/mg,' ').substr(0,180).replace(/(^.{150,179})[\s].+$/m,'$1…')
- }));
- this.redraw();
- var _this = this;
- this.tooltip_$.find(".Rk-CloseX").click(function() {
- _this.renderer.removeRepresentation(_this);
- paper.view.draw();
- });
-}
-
-Rkns.Renderer.EdgeTooltip.prototype.redraw = function() {
- var _coords = this.edge_representation.paper_coords;
- Rkns.Renderer.Utils.drawTooltip(_coords, this.tooltip_block, 250, 5, this.tooltip_$);
- this.tooltip_$.show();
- paper.view.draw();
-}
-
-Rkns.Renderer.EdgeTooltip.prototype.destroy = function() {
- this.tooltip_block.remove();
- this.tooltip_$.detach();
-}
-
-/* */
-
-Rkns.Renderer.Scene = function(_renkan, _project) {
- this.renkan = _renkan;
- this.project = _project;
- this.$ = Rkns.$(".Rk-Render");
- this.representations = [];
- this.$.html(this.template({
- width: this.$.width(),
- height: this.$.height(),
- l10n: _renkan.l10n
- }))
- this.canvas_$ = this.$.find(".Rk-Canvas");
- this.tooltip_$ = this.$.find(".Rk-Editor");
- paper.setup(this.canvas_$[0]);
- this.scale = 1;
- this.offset = paper.view.center;
- this.totalScroll = 0;
- this.click_target = null;
- this.selected_target = null;
- this.edge_layer = new paper.Layer();
- this.node_layer = new paper.Layer();
- this.overlay_layer = new paper.Layer();
- this.bundles = [];
- var _tool = new paper.Tool(),
- _this = this;
- _tool.minDistance = Rkns.Renderer._MIN_DRAG_DISTANCE;
- _tool.onMouseMove = function(_event) {
- _this.onMouseMove(_event);
- }
- _tool.onMouseDown = function(_event) {
- _this.onMouseDown(_event);
- }
- _tool.onMouseDrag = function(_event) {
- _this.onMouseDrag(_event);
- }
- this.canvas_$.mouseup(function(_event) {
- _this.onMouseUp(_event);
- });
- this.canvas_$.mousewheel(function(_event, _delta) {
- _this.onScroll(_event, _delta);
- });
- this.tooltip_$.find(".Rk-ZoomOut").click(function() {
- _this.offset = new paper.Point([
- _this.canvas_$.width(),
- _this.canvas_$.height()
- ]).multiply( .5 * ( 1 - Math.SQRT1_2 ) ).add(_this.offset.multiply( Math.SQRT1_2 ));
- _this.scale *= Math.SQRT1_2;
- _this.redraw();
- });
- this.tooltip_$.find(".Rk-ZoomIn").click(function() {
- _this.offset = new paper.Point([
- _this.canvas_$.width(),
- _this.canvas_$.height()
- ]).multiply( .5 * ( 1 - Math.SQRT2 ) ).add(_this.offset.multiply( Math.SQRT2 ));
- _this.scale *= Math.SQRT2;
- _this.redraw();
- });
- paper.view.onResize = function(_event) {
- _this.offset = _this.offset.add(_event.delta.divide(2));
- _this.redraw();
- }
-
- var _thRedraw = Rkns._.throttle(function() {
- _this.redraw();
- },50);
-
- this.addRepresentations("Node", this.project.get("nodes"));
- this.addRepresentations("Edge", this.project.get("edges"));
-
- this._addNodesBinding = function(_node) {
- _this.addRepresentation("Node", _node);
- _thRedraw();
- }
- this._addEdgesBinding = function(_edge) {
- _this.addRepresentation("Edge", _edge);
- _thRedraw();
- }
-
- this.project.on("add:nodes", this._addNodesBinding );
- this.project.on("add:edges", this._addEdgesBinding );
- this.redraw();
-}
-
-Rkns.Renderer.Scene.prototype.template = Rkns._.template(
- '<canvas class="Rk-Canvas" width="<%-width%>" height="<%-height%>"></canvas><div class="Rk-Editor">'
- + '<div class="Rk-ZoomButtons"><div class="Rk-ZoomIn" title="<%-l10n.zoom_in%>"></div><div class="Rk-ZoomOut" title="<%-l10n.zoom_out%>"></div></div>'
- + '</div>'
-);
-
-Rkns.Renderer.Scene.prototype.addToBundles = function(_edgeRepr) {
- var _bundle = Rkns._(this.bundles).find(function(_bundle) {
- return (
- ( _bundle.from === _edgeRepr.from_representation && _bundle.to === _edgeRepr.to_representation )
- || ( _bundle.from === _edgeRepr.to_representation && _bundle.to === _edgeRepr.from_representation )
- );
- });
- if (typeof _bundle !== "undefined") {
- _bundle.edges.push(_edgeRepr)
- } else {
- _bundle = {
- from: _edgeRepr.from_representation,
- to: _edgeRepr.to_representation,
- edges: [ _edgeRepr ],
- getPosition: function(_er) {
- var _dir = (_er.from_representation === this.from) ? 1 : -1;
- return _dir * ( Rkns._(this.edges).indexOf(_er) - (this.edges.length - 1) / 2 );
- }
- }
- this.bundles.push(_bundle);
- }
- return _bundle;
-}
-
-Rkns.Renderer.Scene.prototype.autoScale = function() {
- var nodes = this.project.get("nodes")
- if (nodes.length > 1) {
- var _xx = nodes.map(function(_node) { return _node.get("position").x }),
- _yy = nodes.map(function(_node) { return _node.get("position").y }),
- _minx = Math.min.apply(Math, _xx),
- _miny = Math.min.apply(Math, _yy),
- _maxx = Math.max.apply(Math, _xx),
- _maxy = Math.max.apply(Math, _yy);
- this.scale = Math.min((paper.view.size.width - 2 * Rkns.Renderer._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * Rkns.Renderer._MARGIN_Y) / (_maxy - _miny));
- this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale));
- this.redraw();
- }
- if (nodes.length === 1) {
- this.scale = 1;
- this.offset = paper.view.center.subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y]));
- this.redraw();
- }
-}
-
-Rkns.Renderer.Scene.prototype.toPaperCoords = function(_point) {
- return _point.multiply(this.scale).add(this.offset);
-}
-
-
-Rkns.Renderer.Scene.prototype.toModelCoords = function(_point) {
- return _point.subtract(this.offset).divide(this.scale);
-}
-
-Rkns.Renderer.Scene.prototype.addRepresentation = function(_type, _model) {
- var _repr = new Rkns.Renderer[_type](this, _model);
- this.representations.push(_repr);
- return _repr;
-}
-
-Rkns.Renderer.Scene.prototype.addRepresentations = function(_type, _collection) {
- var _this = this;
- _collection.forEach(function(_model) {
- _this.addRepresentation(_type, _model);
- });
-}
-
-Rkns.Renderer.Scene.prototype.removeRepresentation = function(_representation) {
- _representation.destroy();
- this.representations = Rkns._(this.representations).reject(
- function(_repr) {
- return _repr == _representation
- }
- );
-}
-
-Rkns.Renderer.Scene.prototype.getRepresentationByModel = function(_model) {
- return Rkns._(this.representations).find(function(_repr) {
- return _repr.model === _model;
- });
-}
-
-Rkns.Renderer.Scene.prototype.removeRepresentationsOfType = function(_type) {
- var _representations = Rkns._(this.representations).filter(function(_repr) {
- return _repr.type == _type;
- }),
- _this = this;
- Rkns._(_representations).each(function(_repr) {
- _this.removeRepresentation(_repr);
- });
-}
-
-Rkns.Renderer.Scene.prototype.unselectAll = function() {
- Rkns._(this.representations).each(function(_repr) {
- _repr.model.trigger("unselect");
- });
-}
-
-Rkns.Renderer.Scene.prototype.redraw = function() {
- Rkns._(this.representations).each(function(_representation) {
- _representation.redraw();
- });
- paper.view.draw();
-}
-
-Rkns.Renderer.Scene.prototype.addTempEdge = function(_from, _point) {
- var _tmpEdge = this.addRepresentation("TempEdge",null);
- _tmpEdge.end_pos = _point;
- _tmpEdge.from_representation = _from;
- _tmpEdge.redraw();
- this.click_target = _tmpEdge;
-}
-
-Rkns.Renderer.Scene.prototype.findTarget = function(_hitResult) {
- if (_hitResult && typeof _hitResult.item.__representation !== "undefined") {
- var _newTarget = _hitResult.item.__representation;
- if (this.selected_target !== _newTarget && _newTarget.model) {
- if (this.selected_target) {
- this.selected_target.model.trigger("unselect");
- }
- _newTarget.model.trigger("select");
- this.selected_target = _newTarget;
- }
- } else {
- if (!_hitResult) {
- this.removeRepresentationsOfType("tooltip");
- }
- if (this.selected_target) {
- this.selected_target.model.trigger("unselect");
- }
- this.selected_target = null;
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseMove = function(_event) {
- var _hitResult = paper.project.hitTest(_event.point);
- if (this.is_dragging) {
- if (this.click_target && typeof this.click_target.paperShift === "function") {
- this.click_target.paperShift(_event.delta);
- } else {
- this.offset = this.offset.add(_event.delta);
- this.redraw();
- }
- } else {
- this.findTarget(_hitResult);
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseDown = function(_event) {
- this.is_dragging = false;
- var _hitResult = paper.project.hitTest(_event.point);
- if (_hitResult && typeof _hitResult.item.__representation !== "undefined") {
- this.click_target = _hitResult.item.__representation;
- } else {
- this.click_target = null;
- }
-}
-
-Rkns.Renderer.Scene.prototype.onMouseDrag = function(_event) {
- this.is_dragging = true;
- this.onMouseMove(_event);
-}
-
-Rkns.Renderer.Scene.prototype.onMouseUp = function(_event) {
- if (this.click_target) {
- var _off = this.canvas_$.offset();
- if (this.click_target.model) {
- this.click_target.model.trigger("click");
- }
- }
- this.is_dragging = false;
- this.click_target = null;
-}
-
-Rkns.Renderer.Scene.prototype.onScroll = function(_event, _scrolldelta) {
- this.totalScroll += _scrolldelta;
- if (Math.abs(this.totalScroll) >= 1) {
- var _off = this.canvas_$.offset(),
- _delta = new paper.Point([
- _event.pageX - _off.left,
- _event.pageY - _off.top
- ]).subtract(this.offset).multiply( Math.SQRT2 - 1 );
- if (this.totalScroll > 0) {
- this.offset = this.offset.subtract(_delta);
- this.scale *= Math.SQRT2;
- } else {
- this.offset = this.offset.add(_delta.divide( Math.SQRT2 ));
- this.scale *= Math.SQRT1_2;
- }
- this.totalScroll = 0;
- this.redraw();
- }
-}
-
-Rkns.Renderer.Scene.prototype.destroy = function() {
- this.project.off("add:nodes", this._addNodesBinding );
- this.project.off("add:edges", this._addEdgesBinding );
- Rkns._(this.representations).each(function(_repr) {
- _repr.destroy();
- });
- this.$.html("");
- paper.remove();
-}
-
--- a/server/src/main/webapp/static/js/twitter-bin.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-Rkns.Twitter = {
-}
-
-Rkns.Twitter.Search = function(_renkan, _opts) {
- this.renkan = _renkan;
- this.opts = _opts;
-}
-
-Rkns.Twitter.Search.prototype.getBgClass = function() {
- return "Rk-Twitter-Icon";
-}
-
-Rkns.Twitter.Search.prototype.getSearchTitle = function() {
- return this.renkan.l10n.search_on_twitter;
-}
-
-Rkns.Twitter.Search.prototype.search = function(_q) {
- this.renkan.tabs.push(
- new Rkns.Twitter.Bin(this.renkan, {
- search: _q
- })
- );
-}
-
-Rkns.Twitter.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
-
-Rkns.Twitter.Bin.prototype.tweetTemplate = Rkns._.template(
- '<li class="Rk-Twitter-Tweet Rk-Bin-Item" data-uri="http://twitter.com/<%=tweet.from_user%>/status/<%=tweet.id_str%>" '
- + 'data-title="Tweet by @<%=tweet.from_user%>" data-description="<%-tweet.text%>" data-image="<%=tweet.profile_image_url%>">'
- + '<img class="Rk-Twitter-TwImage" src="<%=tweet.profile_image_url%>" />'
- + '<h4 class="Rk-Twitter-TwTitle"><a href="http://twitter.com/<%=tweet.from_user%>" target="_blank">@<%=tweet.from_user%></a> (<%=tweet.from_user_name%>)</h4>'
- + '<p class="Rk-Twitter-TwDate"><%=date%></p>'
- + '<p class="Rk-Twitter-TwText"><%=text%></p>'
- + '<p class="Rk-Twitter-TwActions"><a class="Rk-Twitter-TwAction" href="http://twitter.com/<%=tweet.from_user%>/status/<%=tweet.id_str%>" target="_blank">show original</a> · '
- + '<a href="http://twitter.com/intent/tweet?in_reply_to=<%=tweet.id_str%>" target="_blank">reply</a> · '
- + '<a href="http://twitter.com/intent/retweet?tweet_id=<%=tweet.id_str%>" target="_blank">retweet</a> · '
- + '<a href="http://twitter.com/intent/favorite?tweet_id=<%=tweet.id_str%>" target="_blank">favorite</a></p></li>'
-);
-
-Rkns.Twitter.Bin.prototype._init = function(_renkan, _opts) {
- this.renkan = _renkan;
- this.search = _opts.search;
- this.title_icon_$.addClass('Rk-Twitter-Title-Icon');
- this.title_$.html(this.search).addClass("Rk-Twitter-Title");
- this.refresh();
-}
-
-Rkns.Twitter.Bin.prototype.render = function(searchstr) {
- var _rgxp = new RegExp('('+(searchstr || this.search).replace(/(\W)/g,'\\$1')+')','gi');
- if (searchstr) {
- var rxtest = new RegExp(searchstr.replace(/(\W)/g,'\\$1'),'i');
- }
- function highlight(_text) {
- return _text.replace(_rgxp, "<span class='searchmatch'>$1</span>");
- }
- var _html = ""
- _this = this,
- count = 0;
- Rkns._(this.data.results).each(function(_result) {
- if (searchstr && !rxtest.test(_result.text)) {
- return;
- }
- count++;
- var _entities = [],
- _users = _result.text.match(/@[\w_]+/gm),
- _lastpos = 0;
- if (_users) {
- for (var _i = 0; _i < _users.length; _i++) {
- var _m = _users[_i],
- _start = _lastpos + _result.text.substr(_lastpos).search(_m),
- _lastpos = _start + _m.length;
- _entities.push({
- "text" : _m,
- "start" : _start,
- "end" : _lastpos,
- "link" :'<a href="http://twitter.com/' + _m.substr(1) + '" onclick="filtrerTexte(\'' + _m + '\'); return false;" target="_blank">',
- });
- }
- }
- var _hashes = _result.text.match(/([^&]|^)#[^\s,.!?=#@&;()]+/gm),
- _lastpos = 0;
- if (_hashes) {
- for (var _i = 0; _i < _hashes.length; _i++) {
- var _m = _hashes[_i],
- _h = ( _m[0] == '#' ? _m : _m.substr(1) ),
- _start = _lastpos + _result.text.substr(_lastpos).search(_h),
- _lastpos = _start + _h.length;
- _entities.push({
- "text" : _h,
- "start" : _start,
- "end" : _lastpos,
- "link" :'<a href="http://twitter.com/search?q=' + encodeURIComponent(_h) + '" onclick="filtrerTexte(\'' + _.escape(_h) + '\'); return false;" target="_blank">',
- });
- }
- }
-
- var _urls = _result.text.match(/(www\.|https?:\/\/)[\w./_\-]+/gim),
- _lastpos = 0;
- if (_urls) {
- for (var _i = 0; _i < _urls.length; _i++) {
- var _m = _urls[_i],
- _start = _lastpos + _result.text.substr(_lastpos).search(_m),
- _lastpos = _start + _m.length;
- _entities.push({
- "text" : _m,
- "start" : _start,
- "end" : _lastpos,
- "link" :'<a href="' + _m + '" target="_blank">',
- });
- }
- }
- _entities = Rkns._(_entities).sortBy(function(a) { return a.start });
- var _lastend = 0,
- _text = Rkns._(_entities).map(function(_e) {
- var _txt = highlight(_result.text.substring(_lastend, _e.start)) + _e.link + highlight(_e.text) + '</a>';
- _lastend = _e.end;
- return _txt;
- }).join("") + highlight(_result.text.substring(_lastend));
-
- _html += _this.tweetTemplate({
- tweet: _result,
- date: new Date(_result.created_at.replace(/(\+|-)/,'UTC$1')).toLocaleString(),
- text: _text
- });
- });
- this.main_$.html(_html);
- if (searchstr && count) {
- this.count_$.text(count).show();
- } else {
- this.count_$.hide();
- }
- if (searchstr && !count) {
- this.$.hide();
- } else {
- this.$.show();
- }
- this.renkan.resizeBins();
-}
-
-Rkns.Twitter.Bin.prototype.refresh = function() {
- var _this = this;
- Rkns.$.ajax({
- url: "http://search.twitter.com/search.json",
- dataType: "jsonp",
- data: {
- q: this.search,
- rpp: 100
- },
- success: function(_data) {
- _this.data = _data;
- _this.render();
- }
- });
-}
--- a/server/src/main/webapp/static/js/wikipedia-bin.js Wed Feb 13 13:41:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-Rkns.Wikipedia = {
-}
-
-Rkns.Wikipedia.Search = function(_renkan, _opts) {
- this.renkan = _renkan;
- this.lang = _opts.lang || "en";
-}
-
-Rkns.Wikipedia.Search.prototype.getBgClass = function() {
- return "Rk-Wikipedia-Search-Icon Rk-Wikipedia-Lang-" + this.lang;
-}
-
-Rkns.Wikipedia.Search.prototype.getSearchTitle = function() {
- return ( this.renkan.l10n["wiki_" + this.lang] || this.renkan.l10n.wiki_) ;
-}
-
-Rkns.Wikipedia.Search.prototype.search = function(_q) {
- this.renkan.tabs.push(
- new Rkns.Wikipedia.Bin(this.renkan, {
- lang: this.lang,
- search: _q
- })
- );
-}
-
-Rkns.Wikipedia.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
-
-Rkns.Wikipedia.Bin.prototype.resultTemplate = Rkns._.template(
- '<li class="Rk-Wikipedia-Result Rk-Bin-Item" data-uri="<%-url%>" '
- + 'data-title="Wikipedia: <%-title%>" data-description="<%-description%>" data-image="<%-static_url%>img/wikipedia.png">'
- + '<img class="Rk-Wikipedia-Icon" src="<%-static_url%>img/wikipedia.png"></div><h4 class="Rk-Wikipedia-Title"><a href="<%-url%>" target="_blank"><%=htitle%></a></h4>'
- + '<p class="Rk-Wikipedia-Snippet"><%=hdescription%></p></li>'
-);
-
-Rkns.Wikipedia.Bin.prototype._init = function(_renkan, _opts) {
- this.renkan = _renkan;
- this.search = _opts.search;
- this.lang = _opts.lang || "en";
- this.title_icon_$.addClass('Rk-Wikipedia-Title-Icon Rk-Wikipedia-Lang-' + this.lang);
- this.title_$.html(this.search).addClass("Rk-Wikipedia-Title");
- this.refresh();
-}
-
-Rkns.Wikipedia.Bin.prototype.render = function(searchstr) {
- var _rgxp = new RegExp('('+(searchstr || this.search).replace(/(\W)/g,'\\$1')+')','gi');
- if (searchstr) {
- var rxtest = new RegExp(searchstr.replace(/(\W)/g,'\\$1'),'i');
- }
- function highlight(_text) {
- return _text.replace(_rgxp, "<span class='searchmatch'>$1</span>");
- }
- var _html = "",
- _this = this,
- count = 0;
- Rkns._(this.data.query.search).each(function(_result) {
- var title = _result.title,
- url = "http://" + _this.lang + ".wikipedia.org/wiki/" + encodeURI(title.replace(/ /g,"_")),
- description = Rkns.$('<div>').html(_result.snippet).text();
- if (searchstr && !rxtest.test(title) && !rxtest.test(description)) {
- return;
- }
- count++;
- _html += _this.resultTemplate({
- url: url,
- title: title,
- htitle: highlight(title),
- description: description,
- hdescription: highlight(description),
- static_url: _this.renkan.static_url
- });
- });
- _this.main_$.html(_html);
- if (searchstr && count) {
- this.count_$.text(count).show();
- } else {
- this.count_$.hide();
- }
- if (searchstr && !count) {
- this.$.hide();
- } else {
- this.$.show();
- }
- this.renkan.resizeBins();
-}
-
-Rkns.Wikipedia.Bin.prototype.refresh = function() {
- var _this = this;
- Rkns.$.ajax({
- url: "http://" + _this.lang + ".wikipedia.org/w/api.php?action=query&list=search&srsearch=" + encodeURIComponent(this.search) + "&format=json",
- dataType: "jsonp",
- success: function(_data) {
- _this.data = _data;
- _this.render();
- }
- });
-}
\ No newline at end of file
