# HG changeset patch # User ymh # Date 1345119249 -7200 # Node ID 2ab67fa1e78d3bb09fe3013d790df7ec39c45542 # Parent 8e67c9f6da51ca8f8fe72df200f52b0565b84c4f add first server code version diff -r 8e67c9f6da51 -r 2ab67fa1e78d .classpath --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.classpath Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/.jsdtscope --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/.jsdtscope Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.jdt.core.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.jdt.core.prefs Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.ltk.core.refactoring.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.common.component --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.common.component Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.common.project.facet.core.prefs.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,7 @@ + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.common.project.facet.core.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,8 @@ + + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.html.core.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.html.core.prefs Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,2 @@ +document-type/= +eclipse.preferences.version=1 diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.jsdt.ui.superType.container --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.jsdt.ui.superType.name --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,1 @@ +Window \ No newline at end of file diff -r 8e67c9f6da51 -r 2ab67fa1e78d .settings/org.eclipse.wst.ws.service.policy.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.wst.ws.service.policy.prefs Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.wst.ws.service.policy.projectEnabled=false diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/pom.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/pom.xml Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,98 @@ + + + + 4.0.0 + org.iri_research.renkan + renkan + 0.1 + war + + + 0.8.3 + UTF-8 + + + + install + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + org.mortbay.jetty + jetty-maven-plugin + 7.3.0.v20110203 + + 10 + + /renkan + + + + + + maven-war-plugin + 2.1.1 + + + + org.opencoweb + coweb-javascript + war + + META-INF/** + WEB-INF/** + + lib + + + + + + + + + + org.opencoweb + coweb-bots + ${coweb-version} + + + org.opencoweb + coweb-server + ${coweb-version} + + + org.opencoweb + coweb-javascript + ${coweb-version} + war + + + com.sun.jersey + jersey-server + 1.13 + + + com.sun.jersey + jersey-servlet + 1.13 + + + org.mongodb + mongo-java-driver + 2.8.0 + + + + IRI + http://www.iri.centrepompidou.fr + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/java/org/iri_research/renkan/Constants.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/java/org/iri_research/renkan/Constants.java Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,39 @@ +package org.iri_research.renkan; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class Constants { + + @SuppressWarnings("serial") + public final static List VERSION = Collections.unmodifiableList(new ArrayList() { + { + add("0"); + add("1"); + add("0"); + add("final"); + add("0"); + } + }); + + + public static String getVersion() { + + String[] version_array = VERSION.toArray(new String[VERSION.size()]); + + String version = String.format("%s.%s",version_array[0], version_array[1]); + if(version_array[2] != null && !version_array[2].isEmpty() && Integer.parseInt(version_array[2]) > 0 ) { + version = String.format("%s.%s", version, version_array[2]); + } + if (version_array[3] == "alpha" && version_array[4] == "0") { + version = String.format("%s pre-alpha",version); + } + else if(version_array[3] != "final") { + version = String.format("%s %s %s", version, version_array[3], version_array[4]); + } + return version; + + } + +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/java/org/iri_research/renkan/db/MongoConnectionManager.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/java/org/iri_research/renkan/db/MongoConnectionManager.java Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,51 @@ +/** + * + */ +package org.iri_research.renkan.db; + +import java.net.UnknownHostException; + +import com.mongodb.DB; +import com.mongodb.Mongo; +import com.mongodb.MongoException; + +/** + * This singleton class manage the mongo connection. + * This class is thread safe + * The singleton class is implemented following this example : http://en.wikipedia.org/wiki/Singleton_pattern#The_solution_of_Bill_Pugh + * @author ymh + * + */ +public class MongoConnectionManager { + + //TODO: add application parameters + public static final String HOST = "127.0.0.1"; + public static final int PORT = 27017; + public static final String NAME = "renkan"; + + private Mongo mongo = null; + private DB db = null; + + public DB getDb() throws UnknownHostException, MongoException { + if(null == this.db) { + this.mongo = new Mongo(HOST, PORT); + this.db = this.mongo.getDB(NAME); + } + return db; + } + + // Private constructor suppresses generation + // of a (public) default constructor + private MongoConnectionManager() {} + + private static class SingletonHolder { + public static final MongoConnectionManager INSTANCE = new MongoConnectionManager(); + } + + public static MongoConnectionManager getInstance() { + return SingletonHolder.INSTANCE; + } + + + +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/java/org/iri_research/renkan/rest/ProjectsResource.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/java/org/iri_research/renkan/rest/ProjectsResource.java Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,241 @@ +package org.iri_research.renkan.rest; + +import java.net.UnknownHostException; +import java.util.UUID; + +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.core.UriInfo; + +import org.iri_research.renkan.db.MongoConnectionManager; + +import com.mongodb.DB; +import com.mongodb.DBCollection; +import com.mongodb.DBObject; +import com.mongodb.MongoException; +import com.mongodb.WriteResult; +import com.mongodb.util.JSON; +import com.sun.jersey.spi.resource.Singleton; + +@Singleton +@Path("projects") +public class ProjectsResource { + + @Context + private UriInfo uriInfo; + + private DB getDb() { + DB db = null; + try { + db = MongoConnectionManager.getInstance().getDb(); + } catch (UnknownHostException e) { + throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR); + } catch (MongoException e) { + throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR); + } + return db; + } + + private DBCollection getCollection() { + DB db = this.getDb(); + return db.getCollection("projects"); + } + + @GET + @Path("{id : [a-zA-Z\\-0-9]+}") + @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8") + public String getProject(@PathParam("id") String projectId) { + + DBCollection projectCollection = this.getCollection(); + DBObject project = projectCollection.findOne(projectId); + + if (null == project) { + throw new WebApplicationException(Status.NOT_FOUND); + } + + return project.toString(); + + /*return "{" + + "\"title\": \"Test Graph\"," + + "\"creation_date\": \"2012-07-25T11:00:00.0Z\"," + + "\"users\": [" + + "{" + + "\"id\": \"u-cybunk\"," + + "\"title\": \"Samuel\"," + + "\"uri\": \"http://twitter.com/cybunk\"," + + "\"color\": \"#e00000\"" + + "}," + + "{" + + "\"id\": \"u-raphv\"," + + "\"title\": \"Raphael\"," + + "\"uri\": \"http://twitter.com/raphv\"," + + "\"color\": \"#00a000\"" + + "}" + + "]," + + "\"nodes\": [" + + "{" + + "\"id\": \"n-001\"," + + "\"title\": \"連環 (Renkan)\"," + + "\"uri\": \"http://ja.wikipedia.org/wiki/%E7%99%BE%E5%AD%A6%E9%80%A3%E7%92%B0\"," + + "\"created_by\": \"u-cybunk\"," + + "\"position\": {" + + "\"x\": 0," + + "\"y\": 0" + + "}" + + "}," + + "{" + + "\"id\": \"n-002\"," + + "\"title\": \"Savoir\"," + + "\"uri\": \"http://fr.wikipedia.org/wiki/Savoir\"," + + "\"created_by\": \"u-raphv\"," + + "\"position\": {" + + "\"x\": 200," + + "\"y\": 50" + + "}" + + "}," + + "{" + + "\"id\": \"n-003\"," + + "\"title\": \"Connaissance\","+ + "\"uri\": \"http://fr.wikipedia.org/wiki/Connaissance\","+ + "\"created_by\": \"u-raphv\","+ + "\"position\": {"+ + "\"x\": 300,"+ + "\"y\": -50"+ + "}"+ + "},"+ + "{"+ + "\"id\": \"n-004\","+ + "\"title\": \"graphe\","+ + "\"uri\": \"http://fr.wikipedia.org/wiki/Th%C3%A9orie_des_graphes\","+ + "\"created_by\": \"u-cybunk\","+ + "\"position\": {"+ + "\"x\": -200,"+ + "\"y\": 0"+ + "}"+ + "},"+ + "{"+ + "\"id\": \"n-005\","+ + "\"title\": \"nœud\","+ + "\"uri\": \"http://fr.wikipedia.org/wiki/Th%C3%A9orie_des_graphes\","+ + "\"created_by\": \"u-cybunk\","+ + "\"position\": {"+ + "\"x\": -350,"+ + "\"y\": 100"+ + "}"+ + "},"+ + "{"+ + "\"id\": \"n-006\","+ + "\"title\": \"lien\","+ + "\"uri\": \"http://fr.wikipedia.org/wiki/Th%C3%A9orie_des_graphes\","+ + "\"created_by\": \"u-cybunk\","+ + "\"position\": {"+ + "\"x\": -300,"+ + "\"y\": -100"+ + "}"+ + "}"+ + "],"+ + "\"edges\": ["+ + "{"+ + "\"id\": \"e-001\","+ + "\"from\": \"n-001\","+ + "\"to\": \"n-002\","+ + "\"created_by\": \"u-raphv\""+ + "},"+ + "{"+ + "\"id\": \"e-002\","+ + "\"from\": \"n-002\","+ + "\"to\": \"n-003\","+ + "\"created_by\": \"u-raphv\""+ + "},"+ + "{"+ + "\"id\": \"e-003\","+ + "\"from\": \"n-001\","+ + "\"to\": \"n-004\","+ + "\"created_by\": \"u-cybunk\""+ + "},"+ + "{"+ + "\"id\": \"e-004\","+ + "\"from\": \"n-004\","+ + "\"to\": \"n-005\","+ + "\"created_by\": \"u-cybunk\""+ + "},"+ + "{"+ + "\"id\": \"e-005\","+ + "\"from\": \"n-004\","+ + "\"to\": \"n-006\","+ + "\"created_by\": \"u-cybunk\""+ + "}"+ + "]"+ + "}";*/ + } + + /** + * test: curl -i -X PUT -H 'Content-Type: application/json' -d @test-data.json http://localhost:8080/renkan/rest/projects/12eff140-e65c-11e1-aff1-0800200c9a66 + * @param projectId + * @param projectContent + */ + @PUT + @Path("{id : [a-zA-Z\\-0-9]+}") + @Consumes(MediaType.APPLICATION_JSON) + public Response putProject(@PathParam("id") String projectId, String projectContent) { + + return this.createOrUpdateProject(projectId, projectContent); + } + + @POST + @Path("") + @Consumes(MediaType.APPLICATION_JSON) + public Response postProject(String projectContent) { + + return this.createOrUpdateProject(null, projectContent); + + } + + private Response createOrUpdateProject(String projectId, String projectContent) { + + if(null == projectContent || projectContent.isEmpty()) { + throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity("No content").build()); + } + + DBCollection projectCollection = this.getCollection(); + + DBObject obj = (DBObject)JSON.parse(projectContent); + if(obj == null) { + throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity("Parse error").build()); + } + + String newProjectId = projectId; + + if(newProjectId == null) { + newProjectId = UUID.randomUUID().toString(); + } + + obj.put("_id", newProjectId); + + WriteResult res = projectCollection.insert(obj); + + if(res.getLastError().ok()) { + if(projectId == null) { + return Response.created(this.uriInfo.getAbsolutePathBuilder().segment(newProjectId).build()).build(); + } + else { + return Response.noContent().build(); + } + } + else { + throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(res.getError()).build()); + } + + } + +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/WEB-INF/cowebConfig.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/WEB-INF/cowebConfig.json Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,2 @@ +{ +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/WEB-INF/web.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/WEB-INF/web.xml Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,50 @@ + + + + cometd + org.cometd.server.CometdServlet + + logLevel + 0 + + + timeout + 30000 + + + jsonDebug + false + + 1 + + + cometd + /cometd/* + + + admin + org.coweb.servlet.AdminServlet + + ConfigURI + /WEB-INF/cowebConfig.json + + 2 + + + admin + /admin/* + + + rest Servlet + com.sun.jersey.spi.container.servlet.ServletContainer + + com.sun.jersey.config.property.packages + org.iri_research.renkan.rest + + 1 + + + rest Servlet + /rest/* + + \ No newline at end of file diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/css/renkan.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/css/renkan.css Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,95 @@ +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; +} + +.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: 80px; +} + +.Rk-Editor input[type=text] { + font-size: 12px; width: 225px; +} + +.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-Button-Edit, .Rk-Button-Remove { + width: 67px; height: 134px; background: url("../img/remove-edit.png"); +} + +.Rk-Button-Edit { + background-position: -67px -134px; +} + +.Rk-Button-Edit:hover { + background-position: -67px 0; +} + +.Rk-Button-Remove { + background-position: 0 -134px; +} + +.Rk-Button-Remove:hover { + background-position: -67px 0; +} +*/ \ No newline at end of file diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/img/edit.png Binary file server/src/main/webapp/img/edit.png has changed diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/img/remove.png Binary file server/src/main/webapp/img/remove.png has changed diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/index.html Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,12 @@ + + + + + My Cooperative Web Application + + + + + + + diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/js/config.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/js/config.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,31 @@ +// +// Config file. Split out from the app for ease of overlaying a new config +// without affecting the app controller. +// +// Copyright (c) The Dojo Foundation 2011. All Rights Reserved. +// +var dojoConfig = { + baseUrl: '/renkan', + async:true, + paths : { + coweb : 'lib/coweb', + cowebx: 'lib/cowebx', + org : 'lib/org' + }, + packages:[{ + name: 'dojo', + location:'https://ajax.googleapis.com/ajax/libs/dojo/1.7.0/dojo', + main:'main' + }, + { + name: 'dijit', + location:'https://ajax.googleapis.com/ajax/libs/dojo/1.7.0/dijit', + main:'main' + }, + { + name: 'dojox', + location:'https://ajax.googleapis.com/ajax/libs/dojo/1.7.0/dojox', + main:'main' + }] +}; + diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/js/i18n.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/js/i18n.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,12 @@ +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:", + created_by: "Created by:" + } +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/js/json-serializer.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/js/json-serializer.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,115 @@ +Rkns.Serializers.BasicJson = Rkns.Utils.inherit(Rkns.Serializers._Base); + +Rkns.Serializers.BasicJson.prototype._init = function() { + this.load(this._project._opts.url); + var _this = this; + this.save = Rkns._.throttle(function() { + _this._save.apply(this, Array.prototype.slice.call(arguments,0)); + }, 2000); +} + +Rkns.Serializers.BasicJson.prototype.load = function(_url) { + var _this = this; + Rkns.$.getJSON(_url, function(_data) { + _this.deserialize(_data); + _this.handleCallbacks(); + }); +} + +Rkns.Serializers.BasicJson.prototype.deserialize = function(_serializedData) { + if (typeof _serializedData === "string") { + _serializedData = JSON.parse(_serializedData); + } + var _proj = this._project; + _proj.title = _serializedData.title || "(untitled project)"; + if (typeof _serializedData.users === "object" && _serializedData.users) { + Rkns._(_serializedData.users).each(function(_data) { + var _userData = { + id: _data.id, + title: _data.title, + uri: _data.uri, + color: _data.color + }; + _proj.addUser(_userData); + }); + } + if (typeof _serializedData.nodes === "object" && _serializedData.nodes) { + Rkns._(_serializedData.nodes).each(function(_data) { + var _nodeData = { + id: _data.id, + title: _data.title, + description: _data.description, + uri: _data.uri, + created_by: _data.created_by, + position: { + x: _data.position.x, + y: _data.position.y + } + }; + _proj.addNode(_nodeData); + }); + } + if (typeof _serializedData.edges === "object" && _serializedData.edges) { + Rkns._(_serializedData.edges).each(function(_data) { + var _edgeData = { + id: _data.id, + title: _data.title, + uri: _data.uri, + from: _data.from, + to: _data.to, + created_by: _data.created_by + }; + _proj.addEdge(_edgeData); + }); + } +} + +Rkns.Serializers.BasicJson.prototype.serialize = function() { + var _res = { + title: this._project.title, + users: this._project.users.map(function(_user) { + return { + id: _user.id, + title: _user.title, + uri: _user.uri, + color: _user.color + } + }), + nodes: this._project.nodes.map(function(_node) { + return { + id: _node.id, + title: _node.title, + uri: _node.uri, + created_by: _node.created_by.id, + position: { + x: _node.position.x, + y: _node.position.y + } + } + }), + edges: this._project.edges.map(function(_node) { + return { + id: _node.id, + title: _node.title, + description: _node.description, + uri: _node.uri, + from: _node.from.id, + to: _node.to.id, + created_by: _node.created_by.id + } + }) + } + return _res; +} + +Rkns.Serializers.BasicJson.prototype._save = function() { + var _data = JSON.stringify(this.serialize()); + Rkns.$.ajax({ + type: 'PUT', + url: this._project._opts.url, + contentType: "application/json", + data: _data, + success: function(data, textStatus, jqXHR) { + } + }); +}; diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/js/main.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/js/main.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright 2012 Institut de recherche et d'innovation + * contributor(s) : Samuel Huron, Raphael Velt + * + * 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 */ + +Rkns = { + _MIN_DRAG_DISTANCE: 4, + _NODE_RADIUS: 20, + _NODE_FONT_SIZE: 14, + _ARROW_LENGTH: 20, + _ARROW_WIDTH: 15, + _RENDER: 1, + _SAVE: 2, + _RENDER_AND_SAVE: 3 +} + +Rkns.$ = jQuery; + +Rkns._ = _; + +Rkns.Serializers = {}; + +Rkns.Serializers._Base = function(_project) { + if (typeof _project !== "undefined") { + this._project = _project; + this._callbackQueue = []; + this._loaded = false; + } +} + +Rkns.Serializers._Base.prototype.deserialize = function() {} + +Rkns.Serializers._Base.prototype.deferCallback = function(_callback) { + var _this = this; + Rkns._.defer(function() { + _callback.call(_this); + }); +} + +Rkns.Serializers._Base.prototype.handleCallbacks = function() { + this._loaded = true; + while (this._callbackQueue.length) { + this.deferCallback(this._callbackQueue.splice(0,1)[0]); + } +} + +Rkns.Serializers._Base.prototype.onLoad = function(_callback) { + if (this._loaded) { + this.deferCallback(_callback); + } else { + this._callbackQueue.push(_callback); + } +} + +Rkns.Serializers._Base.prototype.save = function() {} + +Rkns.Project = function(_opts) { + if (typeof _opts.serializer == "undefined") { + _opts.serializer = "BasicJson"; + } + if (typeof _opts.language == "undefined" || typeof Rkns.i18n[_opts.language] == "undefined") { + _opts.language = "en"; + } + this.l10n = Rkns.i18n[_opts.language]; + this._opts = _opts; + this.users = new Rkns.Model.List(); + this.nodes = new Rkns.Model.List(); + this.edges = new Rkns.Model.List(); + if (typeof this._opts.user === "object") { + this.current_user = this.addUser(this._opts.user) + } + this.serializer = new Rkns.Serializers[_opts.serializer](this); + this.renderer = new Rkns.Renderer.Scene(this); + var _this = this; + this.serializer.onLoad(function() { + if (typeof _this.current_user === "undefined") { + _this.current_user = _proj.users[0]; + } + _this.renderer.draw(); + }); +} + +Rkns.Project.prototype.addNode = function(_props, _render_save) { + var _node = new Rkns.Model.Node(this, _props); + this.nodes.push(_node); + if (typeof _render_save !== "undefined" && (_render_save&Rkns._RENDER)) { + var _controller = this.renderer.addController("Node", _node); + _controller.redraw(); + } + if (typeof _render_save !== "undefined" && (_render_save&Rkns._SAVE)) { + this.serializer.save(); + } + return _node; +} + +Rkns.Project.prototype.addEdge = function(_props, _render_save) { + var _edge = new Rkns.Model.Edge(this, _props); + this.edges.push(_edge); + if (typeof _render_save !== "undefined" && (_render_save&Rkns._RENDER)) { + var _controller = this.renderer.addController("Edge", _edge); + _controller.redraw(); + } + if (typeof _render_save !== "undefined" && (_render_save&Rkns._SAVE)) { + this.serializer.save(); + } + return _edge; +} + +Rkns.Project.prototype.addUser = function(_props, _render_save) { + var _user = new Rkns.Model.User(this, _props); + this.users.push(_user); + return _user; +} + +Rkns.Project.prototype.updateElement = function(_element, _props, _render_save) { + Rkns._(_props).each(function(_v, _k) { + _element[_k] = _v; + }); + if (typeof _render_save !== "undefined" && (_render_save&Rkns._RENDER)) { + if (typeof _element.__controller !== "undefined") { + _element.__controller.redraw(); + } else { + this._renderer.redraw(); + } + } + if (typeof _render_save !== "undefined" && (_render_save&Rkns._SAVE)) { + this.serializer.save(); + } +} + +Rkns.Project.prototype.removeNode = function(_node, _render_save) { + this.nodes.removeId(_node.id); + if (typeof _node.__controller !== "undefined") { + console.log("Controllers", this.renderer.controllers.length); + this.renderer.removeController(_node.__controller); + console.log("Controllers", this.renderer.controllers.length); + } + console.log(this.edges.length); + var _this = this; + this.edges = this.edges.filter(function(_edge) { + var _keep = _edge.from !== _node && _edge.to !== _node; + if (!_keep && typeof _edge.__controller !== "undefined") { + _this.renderer.removeController(_edge.__controller); + } + return _keep; + }); + if (typeof _render_save !== "undefined" && (_render_save&Rkns._RENDER)) { + this.renderer.redraw(); + } + if (typeof _render_save !== "undefined" && (_render_save&Rkns._SAVE)) { + this.serializer.save(); + } + return _node; +} + +/* 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 (paper.view.size.height - this._EDITOR_MARGIN)) { + _bottom = Math.max( paper.view.size.height - this._EDITOR_MARGIN, _coords.y + this._EDITOR_ARROW_WIDTH / 2 ); + _top = _bottom - _height; + } + _path.segments[0].point + = _path.segments[7].point + = _coords.add([_isLeft * this._EDITOR_MARGIN, 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 - this._EDITOR_ARROW_WIDTH / 2; + _path.segments[6].point.y = _coords.y + this._EDITOR_ARROW_WIDTH / 2; + _path.fillColor = new paper.GradientColor(this._EDITOR_GRADIENT, [0,_top], [0, _bottom]) + return { + left: (this._EDITOR_PADDING + Math.min(_left, _right)), + top: (this._EDITOR_PADDING + _top) + } + }, + sector : function(_inR, _outR, _startAngle, _endAngle, _padding, _imgsrc) { + _path = new paper.Path(); + 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, + _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]]); + _path.add.apply(_path, _segments); + _path.fillColor = "#333333"; + _path.closed = true; + var _grp = new paper.Group([_path]), + _res = { + group: _grp, + circle: _path, + delta: new paper.Point(0,0), + img: _img, + imgdelta: new paper.Point([_centerX, _centerY]) + } + _img.onload = function() { + var _w = _img.width, + _h = _img.height; + var _raster = new paper.Raster(_img); + _raster.position = _res.imgdelta.add(_grp.position).subtract(_res.delta); + _grp.addChild(_raster); + } + _img.src = _imgsrc; + return _res + } +} + +Rkns.Renderer._BaseController = function(_renderer, _element) { + if (typeof _renderer !== "undefined") { + this.id = Rkns.Utils.getUID('controller'); + this._renderer = _renderer; + this._project = _renderer._project; + this._element = _element; + this._element.__controller = this; + } +} + +Rkns.Renderer._BaseController.prototype.select = function() {} + +Rkns.Renderer._BaseController.prototype.unselect = function() {} + +Rkns.Renderer._BaseController.prototype.mouseup = function() {} + +Rkns.Renderer._BaseController.prototype.destroy = function() {} + +Rkns.Renderer.Node = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +Rkns.Renderer.Node.prototype._init = function() { + this._renderer.node_layer.activate(); + this.type = "node"; + this.circle = new paper.Path.Circle([0, 0], Rkns._NODE_RADIUS); + this.circle.fillColor = '#ffffff'; + this.circle.opacity = .9; + this.circle.__controller = this; + this.title = new paper.PointText([0,0]); + this.title.characterStyle = { + fontSize: Rkns._NODE_FONT_SIZE, + fillColor: 'black' + }; + this.edit_button = new Rkns.Renderer.NodeEditButton(this._renderer, {}); + this.edit_button.node_controller = this; + this.remove_button = new Rkns.Renderer.NodeRemoveButton(this._renderer, {}); + this.remove_button.node_controller = this; + this.title.paragraphStyle.justification = 'center'; + this.title.__controller = this; +} + +Rkns.Renderer.Node.prototype.redraw = function() { + var _model_coords = new paper.Point(this._element.position); + this.paper_coords = this._renderer.toPaperCoords(_model_coords); + this.circle.position = this.paper_coords; + this.title.content = this._element.title; + this.title.position = this.paper_coords.add([0, 2 * Rkns._NODE_RADIUS]); + this.circle.strokeColor = this._element.created_by.color; + this.edit_button.moveTo(this.paper_coords); + this.remove_button.moveTo(this.paper_coords); +} + +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._project.updateElement(this._element, _data, Rkns._SAVE); + this._renderer.redraw(); +} + +Rkns.Renderer.Node.prototype.openEditor = function() { + this._renderer.removeControllersOfType("editor"); + var _editor = this._renderer.addController("NodeEditor",{}); + _editor.node_controller = this; + _editor.redraw(); +} + +Rkns.Renderer.Node.prototype.select = function() { + this.circle.strokeWidth = 3; + this.edit_button.show(); + this.remove_button.show(); +} + +Rkns.Renderer.Node.prototype.unselect = function(_newTarget) { + if (!_newTarget || (_newTarget !== this.edit_button && _newTarget !== this.remove_button)) { + this.edit_button.hide(); + this.remove_button.hide(); + } + this.circle.strokeWidth = 1; +} + +Rkns.Renderer.Node.prototype.mouseup = function(_event) { + if (!this._renderer.is_dragging) { + this.openEditor(); + } +} + +Rkns.Renderer.Node.prototype.destroy = function(_event) { + this.edit_button.destroy(); + this.remove_button.destroy(); + this.circle.remove(); + this.title.remove(); +} + +/* */ + +Rkns.Renderer.Edge = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +Rkns.Renderer.Edge.prototype._init = function() { + this._renderer.edge_layer.activate(); + this.type = "edge"; + this.from_controller = this._element.from.__controller; + this.to_node_controller = this._element.to.__controller; + this.line = new paper.Path(); + this.line.add([0,0],[0,0]); + this.line.__controller = this; + this.arrow = new paper.Path(); + this.arrow.add([0,0],[Rkns._ARROW_LENGTH,Rkns._ARROW_WIDTH / 2],[0,Rkns._ARROW_WIDTH]); + this.arrow.__controller = this; + this.text = new paper.PointText(); + this.text.characterStyle = { + fontSize: Rkns._EDGE_FONT_SIZE, + fillColor: 'black' + }; + this.text.paragraphStyle.justification = 'center'; + this.text.__controller = this; + this.text_angle = 0; + this.arrow_angle = 0; +} + +Rkns.Renderer.Edge.prototype.redraw = function() { + var _p0 = this.from_controller.paper_coords, + _p1 = this.to_node_controller.paper_coords, + _a = _p1.subtract(_p0).angle, + _color = this._element.created_by.color; + this.edge_paper_coords = _p0.add(_p1).divide(2); + this.line.strokeColor = _color; + this.line.segments[0].point = _p0; + this.line.segments[1].point = _p1; + this.arrow.rotate(_a - this.arrow_angle); + this.arrow.fillColor = _color; + this.arrow.position = this.edge_paper_coords; + 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._element.title; + this.text.position = this.edge_paper_coords; + this.text_angle = _a; +} + +Rkns.Renderer.Edge.prototype.select = function() { + this.line.strokeWidth = 3; +} + +Rkns.Renderer.Edge.prototype.unselect = function(_newTarget) { + this.line.strokeWidth = 1; +} + +Rkns.Renderer.Edge.prototype.mouseup = function(_event) { + if (!this._renderer.is_dragging) { + this._renderer.removeControllersOfType("editor"); + var _editor = this._renderer.addController("EdgeEditor",{}); + _editor.edge_controller = this; + _editor.redraw(); + } +} + +Rkns.Renderer.Edge.prototype.paperShift = function(_delta) { + this.from_controller.paperShift(_delta); + this.to_node_controller.paperShift(_delta); + this._renderer.redraw(); +} + +Rkns.Renderer.Edge.prototype.destroy = function() { + this.line.remove(); + this.arrow.remove(); + this.text.remove(); +} + +/* */ + +Rkns.Renderer.TempEdge = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +Rkns.Renderer.TempEdge.prototype._init = function() { + this._renderer.edge_layer.activate(); + this.type = "temp-edge"; + var _color = this._project.current_user.color; + this.line = new paper.Path(); + this.line.strokeColor = _color; + this.line.add([0,0],[0,0]); + this.line.__controller = this; + this.arrow = new paper.Path(); + this.arrow.fillColor = _color; + this.arrow.add([0,0],[Rkns._ARROW_LENGTH,Rkns._ARROW_WIDTH / 2],[0,Rkns._ARROW_WIDTH]); + this.arrow.__controller = this; + this.arrow_angle = 0; +} + +Rkns.Renderer.TempEdge.prototype.redraw = function() { + var _p0 = this.from_controller.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); + this._renderer.onMouseMove({point: this.end_pos}); + this.redraw(); +} + +Rkns.Renderer.TempEdge.prototype.mouseup = function(_event) { + var _hitResult = paper.project.hitTest(_event.point); + if (_hitResult && typeof _hitResult.item.__controller !== "undefined") { + var _target = _hitResult.item.__controller; + if (_target.type === "node" && this.from_controller._element.id !== _target._element.id) { + this._project.addEdge({ + from: this.from_controller._element.id, + to: _target._element.id + }, Rkns._RENDER_AND_SAVE) + } + } + this._renderer.removeController(this); +} + +Rkns.Renderer.TempEdge.prototype.destroy = function() { + this.arrow.remove(); + this.line.remove(); +} + +/* */ + +Rkns.Renderer.NodeEditor = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +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.$('
') + .appendTo('.Rk-Editor') + .css({ + position: "absolute", + opacity: .8 + }) + .hide(); +} + +Rkns.Renderer.NodeEditor.prototype.template = Rkns._.template( + '

×<%=l10n.edit_node%>

' + + '

' + + '

' + + '

' + + '

<%=node.created_by.title%>

' +); + +Rkns.Renderer.NodeEditor.prototype.redraw = function() { + var _coords = this.node_controller.paper_coords, + _element = this.node_controller._element, + _css = Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 300); + this.editor_$ + .html(this.template({ + node: _element, + l10n: this._project.l10n + })) + .show() + .css(_css); + var _this = this; + this.editor_$.find(".Rk-CloseX").click(function() { + _this._renderer.removeController(_this); + paper.view.draw(); + }); + this.editor_$.find("input, textarea").bind("keyup change", function() { + var _data = { + title: _this.editor_$.find(".Rk-Edit-Title").val(), + description: _this.editor_$.find(".Rk-Edit-Description").val(), + uri: _this.editor_$.find(".Rk-Edit-URI").val() + } + _this._project.updateElement( + _element, + _data, + Rkns._SAVE + ); + _this.node_controller.redraw(); + paper.view.draw(); + }); + this.editor_$.find(".Rk-Edit-Title")[0].focus(); +} + +Rkns.Renderer.NodeEditor.prototype.destroy = function() { + this.editor_block.remove(); + this.editor_$.detach(); +} + +/* */ + +Rkns.Renderer.EdgeEditor = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +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.$('
') + .appendTo('.Rk-Editor') + .css({ + position: "absolute", + opacity: .8 + }) + .hide(); +} + +Rkns.Renderer.EdgeEditor.prototype.template = Rkns._.template( + '

×<%=l10n.edit_edge%>

' + + '

' + + '

' + + '

<%=edge.from.title%>

' + + '

<%=edge.to.title%>

' + + '

<%=edge.created_by.title%>

' +); + +Rkns.Renderer.EdgeEditor.prototype.redraw = function() { + var _coords = this.edge_controller.edge_paper_coords, + _element = this.edge_controller._element, + _css = Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 200); + this.editor_$ + .html(this.template({ + edge: _element, + l10n: this._project.l10n + })) + .show() + .css(_css); + var _this = this; + this.editor_$.find(".Rk-CloseX").click(function() { + _this._renderer.removeController(_this); + paper.view.draw(); + }); + this.editor_$.find("input, textarea").bind("keyup change", function() { + var _data = { + title: _this.editor_$.find(".Rk-Edit-Title").val(), + uri: _this.editor_$.find(".Rk-Edit-URI").val() + } + _this._project.updateElement( + _element, + _data, + Rkns._SAVE + ); + _this.edge_controller.redraw(); + paper.view.draw(); + }); +} + +Rkns.Renderer.EdgeEditor.prototype.destroy = function() { + this.editor_block.remove(); + this.editor_$.detach(); +} + +/* */ + +Rkns.Renderer.NodeEditButton = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +Rkns.Renderer.NodeEditButton.prototype._init = function() { + this._renderer.node_layer.activate(); + this.type = "node-edit-button"; + this.sector = Rkns.Renderer.Utils.sector(1 + Rkns._NODE_RADIUS, 3 * Rkns._NODE_RADIUS, - 90, 30, 2, 'img/edit.png'); + this.sector.group.visible = false; + this.sector.group.opacity = .5; + this.sector.circle.__controller = this; + this.sector.delta = this.sector.group.position; +} + +Rkns.Renderer.NodeEditButton.prototype.moveTo = function(_pos) { + this.sector.group.position = this.sector.delta.add(_pos); +} + +Rkns.Renderer.NodeEditButton.prototype.show = function() { + this.sector.group.visible = true; +} + +Rkns.Renderer.NodeEditButton.prototype.hide = function() { + this.sector.group.visible = false; +} + +Rkns.Renderer.NodeEditButton.prototype.select = function() { + this.sector.group.opacity = .8; +} + +Rkns.Renderer.NodeEditButton.prototype.unselect = function() { + this.sector.group.opacity = .5; + this.hide(); + this.node_controller.remove_button.hide(); +} + +Rkns.Renderer.NodeEditButton.prototype.mouseup = function() { + if (!this._renderer.is_dragging) { + this.node_controller.openEditor(); + } +} + +Rkns.Renderer.NodeEditButton.prototype.destroy = function() { + this.sector.group.remove(); +} + +/* */ + +Rkns.Renderer.NodeRemoveButton = Rkns.Utils.inherit(Rkns.Renderer._BaseController); + +Rkns.Renderer.NodeRemoveButton.prototype._init = function() { + this._renderer.node_layer.activate(); + this.type = "node-remove-button"; + this.sector = Rkns.Renderer.Utils.sector(1 + Rkns._NODE_RADIUS, 3 * Rkns._NODE_RADIUS, -210, -90, 2, 'img/remove.png'); + this.sector.group.visible = false; + this.sector.group.opacity = .5; + this.sector.circle.__controller = this; + this.sector.delta = this.sector.group.position; +} + +Rkns.Renderer.NodeRemoveButton.prototype.moveTo = function(_pos) { + this.sector.group.position = this.sector.delta.add(_pos); +} + +Rkns.Renderer.NodeRemoveButton.prototype.show = function() { + this.sector.group.visible = true; +} + +Rkns.Renderer.NodeRemoveButton.prototype.hide = function() { + this.sector.group.visible = false; +} + +Rkns.Renderer.NodeRemoveButton.prototype.select = function() { + this.sector.group.opacity = .8; +} + +Rkns.Renderer.NodeRemoveButton.prototype.unselect = function() { + this.sector.group.opacity = .5; + this.hide(); + this.node_controller.edit_button.hide(); +} + +Rkns.Renderer.NodeRemoveButton.prototype.mouseup = function() { + this._renderer._project.removeNode(this.node_controller._element, Rkns._RENDER_AND_SAVE) +} + +Rkns.Renderer.NodeRemoveButton.prototype.destroy = function() { + this.sector.group.remove(); +} + +/* */ + +Rkns.Renderer.Scene = function(_project) { + this._project = _project; + this._MARGIN_X = 80; + this._MARGIN_Y = 50; + var _canvas_id = this._project._opts.canvas_id; + this.$ = Rkns.$("#"+_canvas_id) + paper.setup(document.getElementById(_canvas_id)); + 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(); + var _tool = new paper.Tool(), + _this = this; + _tool.minDistance = Rkns._MIN_DRAG_DISTANCE; + _tool.onMouseMove = function(_event) { + _this.onMouseMove(_event); + } + _tool.onMouseDown = function(_event) { + _this.onMouseDown(_event); + } + _tool.onMouseDrag = function(_event) { + _this.onMouseDrag(_event); + } + _tool.onMouseUp = function(_event) { + _this.onMouseUp(_event); + } + this.$.mousewheel(function(_event, _delta) { + _this.onScroll(_event, _delta); + }) + this.$.dblclick(function(_event) { + _this.onDoubleClick(_event); + }) + paper.view.onResize = function(_event) { + _this.offset = _this.offset.add(_event.delta.divide(2)); + _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.draw = function() { + var _this = this, + _xx = this._project.nodes.map(function(_node) { return _node.position.x }), + _yy = this._project.nodes.map(function(_node) { return _node.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 * this._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * this._MARGIN_Y) / (_maxy - _miny)); + this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale)); + this.controllers = new Rkns.Model.List(); + this._project.nodes.forEach(function(_node) { + _this.addController("Node", _node); + }); + this._project.edges.forEach(function(_edge) { + _this.addController("Edge", _edge); + }); + + this.redraw(); +} + +Rkns.Renderer.Scene.prototype.addController = function(_type, _controller) { + var _el = new Rkns.Renderer[_type](this, _controller); + this.controllers.push(_el); + return _el; +} + +Rkns.Renderer.Scene.prototype.removeController = function(_controller) { + _controller.destroy(); + this.controllers.removeId(_controller.id); +} + +Rkns.Renderer.Scene.prototype.removeControllersOfType = function(_type) { + var _controllers = this.controllers.filter(function(_ctrl) { + return _ctrl.type == _type; + }), + _this = this; + _controllers.forEach(function(_ctrl) { + _this.removeController(_ctrl); + }); +} + +Rkns.Renderer.Scene.prototype.redraw = function() { + this.controllers.forEach(function(_controller) { + _controller.redraw(); + }); + paper.view.draw(); +} + +Rkns.Renderer.Scene.prototype.onMouseMove = function(_event) { + var _hitResult = paper.project.hitTest(_event.point); + if (_hitResult && typeof _hitResult.item.__controller !== "undefined") { + var _newTarget = _hitResult.item.__controller; + if (this.selected_target !== _hitResult.item.__controller) { + 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.onMouseDown = function(_event) { + this.is_dragging = false; + var _hitResult = paper.project.hitTest(_event.point); + if (_hitResult && typeof _hitResult.item.__controller !== "undefined") { + this.click_target = _hitResult.item.__controller; + if (this.click_target.type === "node" && _hitResult.type === "stroke") { + var _tmpEdge = this.addController("TempEdge",{}); + _tmpEdge.end_pos = _event.point; + _tmpEdge.from_controller = this.click_target; + _tmpEdge.redraw(); + this.click_target = _tmpEdge; + } + } else { + this.click_target = null; + } +} + +Rkns.Renderer.Scene.prototype.onMouseDrag = function(_event) { + this.is_dragging = true; + 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(); + } +} + +Rkns.Renderer.Scene.prototype.onMouseUp = function(_event) { + if (this.click_target) { + this.click_target.mouseup(_event); + } + 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.$.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.onDoubleClick = function(_event) { + var _off = this.$.offset(), + _point = new paper.Point([ + _event.pageX - _off.left, + _event.pageY - _off.top + ]); + var _hitResult = paper.project.hitTest(_point); + if (!_hitResult || typeof _hitResult.item.__controller === "undefined") { + var _coords = this.toModelCoords(_point), + _node = this._project.addNode({ + position: { + x: _coords.x, + y: _coords.y + } + }, Rkns._RENDER_AND_SAVE); + _node.__controller.openEditor(); + } + paper.view.draw(); +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/js/random-data.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/js/random-data.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,49 @@ +Rkns.Serializers.RandomData = Rkns.Utils.inherit(Rkns.Serializers._Base); + +Rkns.Serializers.RandomData.prototype._init = function() { + this._USER_COUNT = 5; + this._NODE_COUNT = 20; + this._EDGE_COUNT = 40; + this.user_colors = ["#1f77b4","#aec7e8","#ff7f0e","#ffbb78","#2ca02c","#98df8a","#d62728","#ff9896","#9467bd","#c5b0d5","#8c564b","#c49c94","#e377c2","#f7b6d2","#7f7f7f","#c7c7c7","#bcbd22","#dbdb8d","#17becf","#9edae5"]; + this.load(); +} + +Rkns.Serializers.RandomData.prototype.load = function() { + var _p = this._project; + _p.title = "Random Generated Data"; + for (var i = 0; i < this._USER_COUNT; i++) { + _p.users.push(new Rkns.Model.User(_p, { + id: "user-"+i, + title: "User #"+(1+i), + color: this.user_colors[i] + })); + } + for (var i = 0; i < this._NODE_COUNT; i++) { + _p.nodes.push(new Rkns.Model.Node(_p, { + id: "node-"+i, + title: "Node #"+(1+i), + created_by: "user-" + Math.floor(this._USER_COUNT*Math.random()), + position: { +// x: 200 * Math.random(), +// y: 150 * Math.random() + x: 100 * Math.cos(2 * Math.PI * i / this._NODE_COUNT), + y: 100 * Math.sin(2 * Math.PI * i / this._NODE_COUNT) + } + })); + } + for (var i = 0; i < this._EDGE_COUNT; i++) { + var _from, _to; + _from = _to = Math.floor(this._NODE_COUNT*Math.random()); + while(_from === _to) { + _to = Math.floor(this._NODE_COUNT*Math.random()); + } + _p.edges.push(new Rkns.Model.Edge(_p, { + id: "edge-"+i, + title: "Edge #"+(1+i), + created_by: "user-" + Math.floor(this._USER_COUNT*Math.random()), + from: "node-" + _from, + to: "node-" + _to + })); + } + this.handleCallbacks(); +} diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/lib/jquery.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/lib/jquery.min.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,4 @@ +/*! jQuery v1.7.2 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
"+""+"
",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
t
",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( +a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f +.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/lib/jquery.mousewheel.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/lib/jquery.mousewheel.min.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,12 @@ +/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) + * Licensed under the MIT License (LICENSE.txt). + * + * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. + * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. + * Thanks to: Seamus Leahy for adding deltaX and deltaY + * + * Version: 3.0.6 + * + * Requires: 1.2.2+ + */ +(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery) diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/lib/paper.js Binary file server/src/main/webapp/lib/paper.js has changed diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/lib/underscore-min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/lib/underscore-min.js Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,32 @@ +// Underscore.js 1.3.3 +// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. +// Underscore is freely distributable under the MIT license. +// Portions of Underscore are inspired or borrowed from Prototype, +// Oliver Steele's Functional, and John Resig's Micro-Templating. +// For all details and documentation: +// http://documentcloud.github.com/underscore +(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source== +c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break; +g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a, +c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a==null&&(a=[]);if(A&& +a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a, +c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b, +a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck= +function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]}; +j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a= +i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&& +c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty= +function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"}; +b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a, +b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId= +function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape|| +u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c}; +b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d, +this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this); diff -r 8e67c9f6da51 -r 2ab67fa1e78d server/src/main/webapp/render-test.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/render-test.html Thu Aug 16 14:14:09 2012 +0200 @@ -0,0 +1,57 @@ + + + + + + Test de Rendu RENKAN + + + + + + + + + + + + + + + + + + +
Renkan Top Bar
+
+
Renkan "Stock Box"
+
+ +
+ +
+
+
+ + +