-
-
-
-技术文档
------------------------------------
-* [JEECG 入门视频](http://www.jeecg.org/forum.php?mod=viewthread&tid=197&extra=page%3D1)
-* [JEECG 历史版本](http://www.jeecg.org/forum.php?mod=viewthread&tid=1229&page=1&extra=#pid3642)
-* [JEECG 文档](http://osbaba.com:8002/display/12/Home)
-
-技术交流
------------------------------------
-* 作者：张代浩
-* 邮箱：jeecg@sina.com
-* 论坛：[www.jeecg.org](http://www.jeecg.org)
-* 交流群:106259349, 106838471, 289782002
-* 在线演示: [在线演示](http://219.232.255.211:8080/)
\ No newline at end of file
diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1..00000000
--- a/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/WebContent/WEB-INF/cgi/proxy.cgi b/WebContent/WEB-INF/cgi/proxy.cgi
deleted file mode 100644
index c7ed6629..00000000
--- a/WebContent/WEB-INF/cgi/proxy.cgi
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-
-
-"""This is a blind proxy that we use to get around browser
-restrictions that prevent the Javascript from loading pages not on the
-same server as the Javascript. This has several problems: it's less
-efficient, it might break some sites, and it's a security risk because
-people can use this proxy to browse the web and possibly do bad stuff
-with it. It only loads pages via http and https, but it can load any
-content type. It supports GET and POST requests."""
-
-import urllib2
-import cgi
-import sys, os
-
-# Designed to prevent Open Proxy type stuff.
-
-allowedHosts = ['www.openlayers.org', 'openlayers.org',
- 'labs.metacarta.com', 'world.freemap.in',
- 'prototype.openmnnd.org', 'geo.openplans.org',
- 'sigma.openplans.org', 'demo.opengeo.org',
- 'www.openstreetmap.org', 'sample.azavea.com',
- 'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080',
- 'vmap0.tiles.osgeo.org', 'www.openrouteservice.org','192.168.1.241:8080']
-
-method = os.environ["REQUEST_METHOD"]
-
-if method == "POST":
- qs = os.environ["QUERY_STRING"]
- d = cgi.parse_qs(qs)
- if d.has_key("url"):
- url = d["url"][0]
- else:
- url = "http://www.openlayers.org"
-else:
- fs = cgi.FieldStorage()
- url = fs.getvalue('url', "http://www.openlayers.org")
-
-try:
- host = url.split("/")[2]
- if allowedHosts and not host in allowedHosts:
- print "Status: 502 Bad Gateway"
- print "Content-Type: text/plain"
- print
- print "This proxy does not allow you to access that location (%s)." % (host,)
- print
- print os.environ
-
- elif url.startswith("http://") or url.startswith("https://"):
-
- if method == "POST":
- length = int(os.environ["CONTENT_LENGTH"])
- headers = {"Content-Type": os.environ["CONTENT_TYPE"]}
- body = sys.stdin.read(length)
- r = urllib2.Request(url, body, headers)
- y = urllib2.urlopen(r)
- else:
- y = urllib2.urlopen(url)
-
- # print content type header
- i = y.info()
- if i.has_key("Content-Type"):
- print "Content-Type: %s" % (i["Content-Type"])
- else:
- print "Content-Type: text/plain"
- print
-
- print y.read()
-
- y.close()
- else:
- print "Content-Type: text/plain"
- print
- print "Illegal request."
-
-except Exception, E:
- print "Status: 500 Unexpected Error"
- print "Content-Type: text/plain"
- print
- print "Some unexpected error occurred. Error text was:", E
diff --git a/WebContent/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar b/WebContent/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar
deleted file mode 100644
index c8e51537..00000000
Binary files a/WebContent/WEB-INF/lib/CKFinder-updateByAlexander-2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar b/WebContent/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar
deleted file mode 100644
index 18dd5178..00000000
Binary files a/WebContent/WEB-INF/lib/CKFinderPlugin-FileEditor-2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar b/WebContent/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar
deleted file mode 100644
index aa372c44..00000000
Binary files a/WebContent/WEB-INF/lib/CKFinderPlugin-ImageResize-2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar b/WebContent/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar
deleted file mode 100644
index 67042019..00000000
Binary files a/WebContent/WEB-INF/lib/CKFinderPlugin-Watermark-2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/activation-1.1.1.jar b/WebContent/WEB-INF/lib/activation-1.1.1.jar
deleted file mode 100644
index 1b703ab2..00000000
Binary files a/WebContent/WEB-INF/lib/activation-1.1.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ant-1.6.5.jar b/WebContent/WEB-INF/lib/ant-1.6.5.jar
deleted file mode 100644
index 3beb3b80..00000000
Binary files a/WebContent/WEB-INF/lib/ant-1.6.5.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/antlr-2.7.7.jar b/WebContent/WEB-INF/lib/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b3..00000000
Binary files a/WebContent/WEB-INF/lib/antlr-2.7.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/antlr-3.3.jar b/WebContent/WEB-INF/lib/antlr-3.3.jar
deleted file mode 100644
index 42aed120..00000000
Binary files a/WebContent/WEB-INF/lib/antlr-3.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/antlr-runtime-3.3.jar b/WebContent/WEB-INF/lib/antlr-runtime-3.3.jar
deleted file mode 100644
index c516cb32..00000000
Binary files a/WebContent/WEB-INF/lib/antlr-runtime-3.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/WebContent/WEB-INF/lib/aopalliance-1.0.jar
deleted file mode 100644
index 578b1a0c..00000000
Binary files a/WebContent/WEB-INF/lib/aopalliance-1.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/asm-all-4.1.jar b/WebContent/WEB-INF/lib/asm-all-4.1.jar
deleted file mode 100644
index f35daa63..00000000
Binary files a/WebContent/WEB-INF/lib/asm-all-4.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar b/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar
deleted file mode 100644
index a7efd37c..00000000
Binary files a/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar b/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar
deleted file mode 100644
index 51fc8be1..00000000
Binary files a/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar b/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar
deleted file mode 100644
index b60000b3..00000000
Binary files a/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/avalon-framework-api-4.3.jar b/WebContent/WEB-INF/lib/avalon-framework-api-4.3.jar
deleted file mode 100644
index 0c75529e..00000000
Binary files a/WebContent/WEB-INF/lib/avalon-framework-api-4.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar b/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar
deleted file mode 100644
index d56e9881..00000000
Binary files a/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/avalon-logkit-2.1.jar b/WebContent/WEB-INF/lib/avalon-logkit-2.1.jar
deleted file mode 100644
index 02f07b33..00000000
Binary files a/WebContent/WEB-INF/lib/avalon-logkit-2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-all-1.6.jar b/WebContent/WEB-INF/lib/batik-all-1.6.jar
deleted file mode 100644
index 7b59021d..00000000
Binary files a/WebContent/WEB-INF/lib/batik-all-1.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-anim-1.7.jar b/WebContent/WEB-INF/lib/batik-anim-1.7.jar
deleted file mode 100644
index 2a150b2b..00000000
Binary files a/WebContent/WEB-INF/lib/batik-anim-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar b/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar
deleted file mode 100644
index f83b5bd4..00000000
Binary files a/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-bridge-1.7.jar b/WebContent/WEB-INF/lib/batik-bridge-1.7.jar
deleted file mode 100644
index 872cf27a..00000000
Binary files a/WebContent/WEB-INF/lib/batik-bridge-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-css-1.7.jar b/WebContent/WEB-INF/lib/batik-css-1.7.jar
deleted file mode 100644
index ef3013d0..00000000
Binary files a/WebContent/WEB-INF/lib/batik-css-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-dom-1.7.jar b/WebContent/WEB-INF/lib/batik-dom-1.7.jar
deleted file mode 100644
index 02064754..00000000
Binary files a/WebContent/WEB-INF/lib/batik-dom-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-ext-1.7.jar b/WebContent/WEB-INF/lib/batik-ext-1.7.jar
deleted file mode 100644
index 57fb2732..00000000
Binary files a/WebContent/WEB-INF/lib/batik-ext-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-gvt-1.7.jar b/WebContent/WEB-INF/lib/batik-gvt-1.7.jar
deleted file mode 100644
index 9aa96868..00000000
Binary files a/WebContent/WEB-INF/lib/batik-gvt-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-js-1.7.jar b/WebContent/WEB-INF/lib/batik-js-1.7.jar
deleted file mode 100644
index ccad3cc1..00000000
Binary files a/WebContent/WEB-INF/lib/batik-js-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-parser-1.7.jar b/WebContent/WEB-INF/lib/batik-parser-1.7.jar
deleted file mode 100644
index b84ad36e..00000000
Binary files a/WebContent/WEB-INF/lib/batik-parser-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-script-1.7.jar b/WebContent/WEB-INF/lib/batik-script-1.7.jar
deleted file mode 100644
index a684f1c7..00000000
Binary files a/WebContent/WEB-INF/lib/batik-script-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar b/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar
deleted file mode 100644
index 463d0e01..00000000
Binary files a/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-svggen-1.7.jar b/WebContent/WEB-INF/lib/batik-svggen-1.7.jar
deleted file mode 100644
index 0feaf605..00000000
Binary files a/WebContent/WEB-INF/lib/batik-svggen-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar b/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar
deleted file mode 100644
index 3934ed0a..00000000
Binary files a/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-util-1.7.jar b/WebContent/WEB-INF/lib/batik-util-1.7.jar
deleted file mode 100644
index c50d1ff2..00000000
Binary files a/WebContent/WEB-INF/lib/batik-util-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/batik-xml-1.7.jar b/WebContent/WEB-INF/lib/batik-xml-1.7.jar
deleted file mode 100644
index 45ba1570..00000000
Binary files a/WebContent/WEB-INF/lib/batik-xml-1.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/cglib-nodep-2.2.jar b/WebContent/WEB-INF/lib/cglib-nodep-2.2.jar
deleted file mode 100644
index ed07cb50..00000000
Binary files a/WebContent/WEB-INF/lib/cglib-nodep-2.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/classmate-0.5.4.jar b/WebContent/WEB-INF/lib/classmate-0.5.4.jar
deleted file mode 100644
index 35d1c07f..00000000
Binary files a/WebContent/WEB-INF/lib/classmate-0.5.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/codegenerate-3.4.6.jar b/WebContent/WEB-INF/lib/codegenerate-3.4.6.jar
deleted file mode 100644
index e1d9cf22..00000000
Binary files a/WebContent/WEB-INF/lib/codegenerate-3.4.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar b/WebContent/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar
deleted file mode 100644
index 8fc762f8..00000000
Binary files a/WebContent/WEB-INF/lib/com.springsource.org.junit-4.9.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-beanutils-1.7.0.jar b/WebContent/WEB-INF/lib/commons-beanutils-1.7.0.jar
deleted file mode 100644
index b1b89c9c..00000000
Binary files a/WebContent/WEB-INF/lib/commons-beanutils-1.7.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-chain-1.2.jar b/WebContent/WEB-INF/lib/commons-chain-1.2.jar
deleted file mode 100644
index 20fa4c59..00000000
Binary files a/WebContent/WEB-INF/lib/commons-chain-1.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-codec-1.3.jar b/WebContent/WEB-INF/lib/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752..00000000
Binary files a/WebContent/WEB-INF/lib/commons-codec-1.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar b/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1fe..00000000
Binary files a/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar b/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar
deleted file mode 100644
index c4c1c4f2..00000000
Binary files a/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-digester-2.0.jar b/WebContent/WEB-INF/lib/commons-digester-2.0.jar
deleted file mode 100644
index 9c8bd13a..00000000
Binary files a/WebContent/WEB-INF/lib/commons-digester-2.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-email-1.2.jar b/WebContent/WEB-INF/lib/commons-email-1.2.jar
deleted file mode 100644
index f0859759..00000000
Binary files a/WebContent/WEB-INF/lib/commons-email-1.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar b/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
deleted file mode 100644
index 7db423ed..00000000
Binary files a/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-io-1.3.2.jar b/WebContent/WEB-INF/lib/commons-io-1.3.2.jar
deleted file mode 100644
index 865c9e41..00000000
Binary files a/WebContent/WEB-INF/lib/commons-io-1.3.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-lang-2.6.jar b/WebContent/WEB-INF/lib/commons-lang-2.6.jar
deleted file mode 100644
index 98467d3a..00000000
Binary files a/WebContent/WEB-INF/lib/commons-lang-2.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-lang3-3.1.jar b/WebContent/WEB-INF/lib/commons-lang3-3.1.jar
deleted file mode 100644
index a85e539b..00000000
Binary files a/WebContent/WEB-INF/lib/commons-lang3-3.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144..00000000
Binary files a/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-logging-api-1.1.jar b/WebContent/WEB-INF/lib/commons-logging-api-1.1.jar
deleted file mode 100644
index d1abcbb4..00000000
Binary files a/WebContent/WEB-INF/lib/commons-logging-api-1.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-pool-1.6.jar b/WebContent/WEB-INF/lib/commons-pool-1.6.jar
deleted file mode 100644
index 72ca75a3..00000000
Binary files a/WebContent/WEB-INF/lib/commons-pool-1.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/commons-validator-1.3.1.jar b/WebContent/WEB-INF/lib/commons-validator-1.3.1.jar
deleted file mode 100644
index 55b12b1a..00000000
Binary files a/WebContent/WEB-INF/lib/commons-validator-1.3.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
deleted file mode 100644
index c8c4dbb9..00000000
Binary files a/WebContent/WEB-INF/lib/dom4j-1.6.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/druid-0.2.9.jar b/WebContent/WEB-INF/lib/druid-0.2.9.jar
deleted file mode 100644
index bf04821f..00000000
Binary files a/WebContent/WEB-INF/lib/druid-0.2.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/easypoi-base-2.0.5.jar b/WebContent/WEB-INF/lib/easypoi-base-2.0.5.jar
deleted file mode 100644
index a21babbc..00000000
Binary files a/WebContent/WEB-INF/lib/easypoi-base-2.0.5.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/easypoi-web-2.0.5.jar b/WebContent/WEB-INF/lib/easypoi-web-2.0.5.jar
deleted file mode 100644
index 82a951d8..00000000
Binary files a/WebContent/WEB-INF/lib/easypoi-web-2.0.5.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ehcache-core-2.4.3.jar b/WebContent/WEB-INF/lib/ehcache-core-2.4.3.jar
deleted file mode 100644
index 7a26318d..00000000
Binary files a/WebContent/WEB-INF/lib/ehcache-core-2.4.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ezmorph-1.0.3.jar b/WebContent/WEB-INF/lib/ezmorph-1.0.3.jar
deleted file mode 100644
index 179b8d6f..00000000
Binary files a/WebContent/WEB-INF/lib/ezmorph-1.0.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/fastjson-1.1.37.jar b/WebContent/WEB-INF/lib/fastjson-1.1.37.jar
deleted file mode 100644
index 1b13b826..00000000
Binary files a/WebContent/WEB-INF/lib/fastjson-1.1.37.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/fop-0.94.jar b/WebContent/WEB-INF/lib/fop-0.94.jar
deleted file mode 100644
index 00003698..00000000
Binary files a/WebContent/WEB-INF/lib/fop-0.94.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/fop-1.0.jar b/WebContent/WEB-INF/lib/fop-1.0.jar
deleted file mode 100644
index f7a3a2c7..00000000
Binary files a/WebContent/WEB-INF/lib/fop-1.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/freemarker-2.3.19.jar b/WebContent/WEB-INF/lib/freemarker-2.3.19.jar
deleted file mode 100644
index b13671da..00000000
Binary files a/WebContent/WEB-INF/lib/freemarker-2.3.19.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar b/WebContent/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar
deleted file mode 100644
index 7615e517..00000000
Binary files a/WebContent/WEB-INF/lib/geronimo-spec-javamail-1.3.1-rc3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar b/WebContent/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar
deleted file mode 100644
index 584a7cea..00000000
Binary files a/WebContent/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/groovy-2.3.3.jar b/WebContent/WEB-INF/lib/groovy-2.3.3.jar
deleted file mode 100644
index 2f5c2ef5..00000000
Binary files a/WebContent/WEB-INF/lib/groovy-2.3.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/gson-2.2.4.jar b/WebContent/WEB-INF/lib/gson-2.2.4.jar
deleted file mode 100644
index 75fe27c5..00000000
Binary files a/WebContent/WEB-INF/lib/gson-2.2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/guava-16.0.1.jar b/WebContent/WEB-INF/lib/guava-16.0.1.jar
deleted file mode 100644
index 2c8127d1..00000000
Binary files a/WebContent/WEB-INF/lib/guava-16.0.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar b/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar
deleted file mode 100644
index c26aba4e..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-core-4.2.3.Final.jar b/WebContent/WEB-INF/lib/hibernate-core-4.2.3.Final.jar
deleted file mode 100644
index d8253ca2..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-core-4.2.3.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar b/WebContent/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar
deleted file mode 100644
index d5d9c299..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-ehcache-4.1.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
deleted file mode 100644
index 1e9f71b8..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar b/WebContent/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar
deleted file mode 100644
index 01689b09..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-proxool-4.1.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar b/WebContent/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar
deleted file mode 100644
index dcc4e52d..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar b/WebContent/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar
deleted file mode 100644
index 068581b6..00000000
Binary files a/WebContent/WEB-INF/lib/hibernate-validator-annotation-processor-4.2.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-1.84.jar b/WebContent/WEB-INF/lib/jackson-1.84.jar
deleted file mode 100644
index dcc7aff8..00000000
Binary files a/WebContent/WEB-INF/lib/jackson-1.84.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-core-asl-1.8.4.jar b/WebContent/WEB-INF/lib/jackson-core-asl-1.8.4.jar
deleted file mode 100644
index 4387223d..00000000
Binary files a/WebContent/WEB-INF/lib/jackson-core-asl-1.8.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar b/WebContent/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar
deleted file mode 100644
index 77bbe00a..00000000
Binary files a/WebContent/WEB-INF/lib/jackson-mapper-asl-1.8.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jacob-1.0.0.jar b/WebContent/WEB-INF/lib/jacob-1.0.0.jar
deleted file mode 100644
index 35ce4fa9..00000000
Binary files a/WebContent/WEB-INF/lib/jacob-1.0.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jacob-1.14.3.jar b/WebContent/WEB-INF/lib/jacob-1.14.3.jar
deleted file mode 100644
index 28e0c41e..00000000
Binary files a/WebContent/WEB-INF/lib/jacob-1.14.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar b/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar
deleted file mode 100644
index 5af8eaeb..00000000
Binary files a/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/javassist-3.7.ga.jar b/WebContent/WEB-INF/lib/javassist-3.7.ga.jar
deleted file mode 100644
index 44d16dac..00000000
Binary files a/WebContent/WEB-INF/lib/javassist-3.7.ga.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar b/WebContent/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar
deleted file mode 100644
index cd095e69..00000000
Binary files a/WebContent/WEB-INF/lib/jboss-logging-3.1.0.CR2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar b/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar
deleted file mode 100644
index b3bf81f6..00000000
Binary files a/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar b/WebContent/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar
deleted file mode 100644
index 6d9b9cd2..00000000
Binary files a/WebContent/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jdbc2005-1.0.0.jar b/WebContent/WEB-INF/lib/jdbc2005-1.0.0.jar
deleted file mode 100644
index 0d9b52cb..00000000
Binary files a/WebContent/WEB-INF/lib/jdbc2005-1.0.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jodconverter-3.0-beta-4.jar b/WebContent/WEB-INF/lib/jodconverter-3.0-beta-4.jar
deleted file mode 100644
index af626dac..00000000
Binary files a/WebContent/WEB-INF/lib/jodconverter-3.0-beta-4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jodd-3.3.7.jar b/WebContent/WEB-INF/lib/jodd-3.3.7.jar
deleted file mode 100644
index 04cafef2..00000000
Binary files a/WebContent/WEB-INF/lib/jodd-3.3.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/json-lib-2.1-jdk15.jar b/WebContent/WEB-INF/lib/json-lib-2.1-jdk15.jar
deleted file mode 100644
index 28880c41..00000000
Binary files a/WebContent/WEB-INF/lib/json-lib-2.1-jdk15.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jstl-1.2.jar b/WebContent/WEB-INF/lib/jstl-1.2.jar
deleted file mode 100644
index 0fd275e9..00000000
Binary files a/WebContent/WEB-INF/lib/jstl-1.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jtds-1.2.4.jar b/WebContent/WEB-INF/lib/jtds-1.2.4.jar
deleted file mode 100644
index 94b2e515..00000000
Binary files a/WebContent/WEB-INF/lib/jtds-1.2.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/juh-3.2.1.jar b/WebContent/WEB-INF/lib/juh-3.2.1.jar
deleted file mode 100644
index 423a9070..00000000
Binary files a/WebContent/WEB-INF/lib/juh-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/junit-4.7.jar b/WebContent/WEB-INF/lib/junit-4.7.jar
deleted file mode 100644
index 700ad695..00000000
Binary files a/WebContent/WEB-INF/lib/junit-4.7.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jurt-3.2.1.jar b/WebContent/WEB-INF/lib/jurt-3.2.1.jar
deleted file mode 100644
index a71926b9..00000000
Binary files a/WebContent/WEB-INF/lib/jurt-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/log4j-1.2.16.jar b/WebContent/WEB-INF/lib/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903..00000000
Binary files a/WebContent/WEB-INF/lib/log4j-1.2.16.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/mail-1.4.1.jar b/WebContent/WEB-INF/lib/mail-1.4.1.jar
deleted file mode 100644
index 1d15e793..00000000
Binary files a/WebContent/WEB-INF/lib/mail-1.4.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/minidao-1.4.0.jar b/WebContent/WEB-INF/lib/minidao-1.4.0.jar
deleted file mode 100644
index db331e4e..00000000
Binary files a/WebContent/WEB-INF/lib/minidao-1.4.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/mybatis-3.1.1.jar b/WebContent/WEB-INF/lib/mybatis-3.1.1.jar
deleted file mode 100644
index 2801833e..00000000
Binary files a/WebContent/WEB-INF/lib/mybatis-3.1.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/mybatis-spring-1.1.1.jar b/WebContent/WEB-INF/lib/mybatis-spring-1.1.1.jar
deleted file mode 100644
index 64ce2e07..00000000
Binary files a/WebContent/WEB-INF/lib/mybatis-spring-1.1.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.27.jar b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.27.jar
deleted file mode 100644
index 8bed6a2c..00000000
Binary files a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.27.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ognl-2.6.11.jar b/WebContent/WEB-INF/lib/ognl-2.6.11.jar
deleted file mode 100644
index 19cd379a..00000000
Binary files a/WebContent/WEB-INF/lib/ognl-2.6.11.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ognl-2.7.3.jar b/WebContent/WEB-INF/lib/ognl-2.7.3.jar
deleted file mode 100644
index 6517028b..00000000
Binary files a/WebContent/WEB-INF/lib/ognl-2.7.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar b/WebContent/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar
deleted file mode 100644
index 05adfefa..00000000
Binary files a/WebContent/WEB-INF/lib/ojdbc14-10.2.0.5.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar b/WebContent/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar
deleted file mode 100644
index b86b3d91..00000000
Binary files a/WebContent/WEB-INF/lib/org-apache-batik-all-1.7-201003011305.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar b/WebContent/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar
deleted file mode 100644
index df955957..00000000
Binary files a/WebContent/WEB-INF/lib/org-apache-commons-logging-1.0.4-201003011305.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/org.quartz-1.6.2.jar b/WebContent/WEB-INF/lib/org.quartz-1.6.2.jar
deleted file mode 100644
index 30dcee7b..00000000
Binary files a/WebContent/WEB-INF/lib/org.quartz-1.6.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/pinyin4j-2.5.0.jar b/WebContent/WEB-INF/lib/pinyin4j-2.5.0.jar
deleted file mode 100644
index e8ede137..00000000
Binary files a/WebContent/WEB-INF/lib/pinyin4j-2.5.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/poi-3.9.jar b/WebContent/WEB-INF/lib/poi-3.9.jar
deleted file mode 100644
index 0f462880..00000000
Binary files a/WebContent/WEB-INF/lib/poi-3.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/poi-ooxml-3.9.jar b/WebContent/WEB-INF/lib/poi-ooxml-3.9.jar
deleted file mode 100644
index 8792d463..00000000
Binary files a/WebContent/WEB-INF/lib/poi-ooxml-3.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/poi-ooxml-schemas-3.9.jar b/WebContent/WEB-INF/lib/poi-ooxml-schemas-3.9.jar
deleted file mode 100644
index eda4ef49..00000000
Binary files a/WebContent/WEB-INF/lib/poi-ooxml-schemas-3.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/poi-scratchpad-3.9.jar b/WebContent/WEB-INF/lib/poi-scratchpad-3.9.jar
deleted file mode 100644
index 15208552..00000000
Binary files a/WebContent/WEB-INF/lib/poi-scratchpad-3.9.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar b/WebContent/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar
deleted file mode 100644
index 10535cff..00000000
Binary files a/WebContent/WEB-INF/lib/postgresql-9.1-903.jdbc4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/proxool-0.8.3.jar b/WebContent/WEB-INF/lib/proxool-0.8.3.jar
deleted file mode 100644
index c4f700cf..00000000
Binary files a/WebContent/WEB-INF/lib/proxool-0.8.3.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/proxool-0.9.1.jar b/WebContent/WEB-INF/lib/proxool-0.9.1.jar
deleted file mode 100644
index ffb163f2..00000000
Binary files a/WebContent/WEB-INF/lib/proxool-0.9.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/proxool-cglib-0.9.1.jar b/WebContent/WEB-INF/lib/proxool-cglib-0.9.1.jar
deleted file mode 100644
index 4fe25c13..00000000
Binary files a/WebContent/WEB-INF/lib/proxool-cglib-0.9.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/ridl-3.2.1.jar b/WebContent/WEB-INF/lib/ridl-3.2.1.jar
deleted file mode 100644
index d2325145..00000000
Binary files a/WebContent/WEB-INF/lib/ridl-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
deleted file mode 100644
index f1f4fdd2..00000000
Binary files a/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.1.jar b/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
deleted file mode 100644
index 64115995..00000000
Binary files a/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar
deleted file mode 100644
index 73ba4049..00000000
Binary files a/WebContent/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar
deleted file mode 100644
index 20d79385..00000000
Binary files a/WebContent/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar
deleted file mode 100644
index 27b138d9..00000000
Binary files a/WebContent/WEB-INF/lib/spring-aspects-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar
deleted file mode 100644
index a69bcb1f..00000000
Binary files a/WebContent/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar
deleted file mode 100644
index a35e4869..00000000
Binary files a/WebContent/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar
deleted file mode 100644
index 8e8fff4c..00000000
Binary files a/WebContent/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar
deleted file mode 100644
index bdd8944a..00000000
Binary files a/WebContent/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar
deleted file mode 100644
index 0e445b97..00000000
Binary files a/WebContent/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar
deleted file mode 100644
index 82b836a1..00000000
Binary files a/WebContent/WEB-INF/lib/spring-jdbc-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar
deleted file mode 100644
index 5e5f16d5..00000000
Binary files a/WebContent/WEB-INF/lib/spring-orm-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar
deleted file mode 100644
index 824e3c3f..00000000
Binary files a/WebContent/WEB-INF/lib/spring-tx-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar
deleted file mode 100644
index 42ed92c7..00000000
Binary files a/WebContent/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar b/WebContent/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar
deleted file mode 100644
index 8e27a5bc..00000000
Binary files a/WebContent/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/stax-api-1.0.1.jar b/WebContent/WEB-INF/lib/stax-api-1.0.1.jar
deleted file mode 100644
index d9a16651..00000000
Binary files a/WebContent/WEB-INF/lib/stax-api-1.0.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/stringtemplate-3.2.1.jar b/WebContent/WEB-INF/lib/stringtemplate-3.2.1.jar
deleted file mode 100644
index d0e11b71..00000000
Binary files a/WebContent/WEB-INF/lib/stringtemplate-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/thumbnailator-0.4.6.jar b/WebContent/WEB-INF/lib/thumbnailator-0.4.6.jar
deleted file mode 100644
index 39f745ba..00000000
Binary files a/WebContent/WEB-INF/lib/thumbnailator-0.4.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/unoil-3.2.1.jar b/WebContent/WEB-INF/lib/unoil-3.2.1.jar
deleted file mode 100644
index e5bd96c1..00000000
Binary files a/WebContent/WEB-INF/lib/unoil-3.2.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/validation-api-1.0.0.GA.jar b/WebContent/WEB-INF/lib/validation-api-1.0.0.GA.jar
deleted file mode 100644
index 1ff2dd71..00000000
Binary files a/WebContent/WEB-INF/lib/validation-api-1.0.0.GA.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xalan-2.7.0.jar b/WebContent/WEB-INF/lib/xalan-2.7.0.jar
deleted file mode 100644
index 007be396..00000000
Binary files a/WebContent/WEB-INF/lib/xalan-2.7.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xercesImpl-2.7.1.jar b/WebContent/WEB-INF/lib/xercesImpl-2.7.1.jar
deleted file mode 100644
index 0b100e14..00000000
Binary files a/WebContent/WEB-INF/lib/xercesImpl-2.7.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar b/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar
deleted file mode 100644
index d42c0ea6..00000000
Binary files a/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar b/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar
deleted file mode 100644
index a7869d68..00000000
Binary files a/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xmlbeans-2.3.0.jar b/WebContent/WEB-INF/lib/xmlbeans-2.3.0.jar
deleted file mode 100644
index ccd81634..00000000
Binary files a/WebContent/WEB-INF/lib/xmlbeans-2.3.0.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xmlgraphics-commons-1.4.jar b/WebContent/WEB-INF/lib/xmlgraphics-commons-1.4.jar
deleted file mode 100644
index 01bc3916..00000000
Binary files a/WebContent/WEB-INF/lib/xmlgraphics-commons-1.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar b/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar
deleted file mode 100644
index cbc149d0..00000000
Binary files a/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar b/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar
deleted file mode 100644
index 813a9a83..00000000
Binary files a/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xstream-1.4.4.jar b/WebContent/WEB-INF/lib/xstream-1.4.4.jar
deleted file mode 100644
index dcedd5aa..00000000
Binary files a/WebContent/WEB-INF/lib/xstream-1.4.4.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/xwork-core-2.1.6.jar b/WebContent/WEB-INF/lib/xwork-core-2.1.6.jar
deleted file mode 100644
index bd5996bd..00000000
Binary files a/WebContent/WEB-INF/lib/xwork-core-2.1.6.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/tld/easyui.tld b/WebContent/WEB-INF/tld/easyui.tld
deleted file mode 100644
index c7a04f36..00000000
--- a/WebContent/WEB-INF/tld/easyui.tld
+++ /dev/null
@@ -1,1347 +0,0 @@
-
-
-
-
-
-
- Hello World!
- - diff --git a/WebContent/init.jsp b/WebContent/init.jsp deleted file mode 100644 index d8b05747..00000000 --- a/WebContent/init.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@include file="/context/mytags.jsp"%> - - - -鏁版嵁搴撳垵濮嬪寲涓..... -<%--update-begin--Author:zhangguoming Date:20140609 for锛氫簯妗岄潰锛屾竻闄ゆ闈㈠浘鏍囩殑cookie鍘嗗彶璁板綍--%> - - - -<%--update-end--Author:zhangguoming Date:20140609 for锛氫簯妗岄潰锛屾竻闄ゆ闈㈠浘鏍囩殑cookie鍘嗗彶璁板綍--%> - - - -Flash version " + opts.version + " or greater is required
" + - "" + - (VERSION[0] > 0 ? "Your version is " + VERSION : "You have no flash plugin installed") + - "
" + - - (root.tagName == 'A' ? "Click here to download latest version
" : - "Download latest version from here
"); - */ - var pageHost = ((document.location.protocol == "https:") ? "https://" : "http://"); - - root.innerHTML = "![Get Adobe Flash player]("
- + pageHost + "www.adobe.com/images/shared/download_buttons/get_flash_player.gif)
";
-
- if (root.tagName == 'A') {
- root.onclick = function() {
- location.href = URL;
- };
- }
- }
-
- // onFail
- if (opts.onFail) {
- var ret = opts.onFail.call(this);
- if (typeof ret == 'string') { root.innerHTML = ret; }
- }
- }
-
- // http://flowplayer.org/forum/8/18186#post-18593
- if (IE) {
- window[opts.id] = document.getElementById(opts.id);
- }
-
- // API methods for callback
- extend(this, {
-
- getRoot: function() {
- return root;
- },
-
- getOptions: function() {
- return opts;
- },
-
-
- getConf: function() {
- return conf;
- },
-
- getApi: function() {
- return root.firstChild;
- }
-
- });
- }
-
- // setup jquery support
- if (JQUERY) {
-
- // tools version number
- jQuery.tools = jQuery.tools || {version: '1.2.5'};
-
- jQuery.tools.flashembed = {
- conf: GLOBAL_OPTS
- };
-
- jQuery.fn.flashembed = function(opts, conf) {
- return this.each(function() {
- $(this).data("flashembed", flashembed(this, opts, conf));
- });
- };
- }
-
-})();
\ No newline at end of file
diff --git a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.js b/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.js
deleted file mode 100644
index 98446dd9..00000000
--- a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- Highcharts JS v2.2.5 (2012-06-08)
- MooTools adapter
-
- (c) 2010-2011 Torstein H?nsi
-
- License: www.highcharts.com/license
-*/
-(function(){var e=window,i=document,f=e.MooTools.version.substring(0,3),g=f==="1.2"||f==="1.1",j=g||f==="1.3",h=e.$extend||function(){return Object.append.apply(Object,arguments)};e.HighchartsAdapter={init:function(a){var b=Fx.prototype,c=b.start,d=Fx.Morph.prototype,e=d.compute;b.start=function(b,d){var e=this.element;if(b.d)this.paths=a.init(e,e.d,this.toD);c.apply(this,arguments);return this};d.compute=function(b,c,d){var f=this.paths;if(f)this.element.attr("d",a.step(f[0],f[1],d,this.toD));else return e.apply(this,
-arguments)}},adapterRun:function(a,b){return $(a).getStyle(b).toInt()},getScript:function(a,b){var c=i.getElementsByTagName("head")[0],d=i.createElement("script");d.type="text/javascript";d.src=a;d.onload=b;c.appendChild(d)},animate:function(a,b,c){var d=a.attr,f=c&&c.complete;if(d&&!a.setStyle)a.getStyle=a.attr,a.setStyle=function(){var b=arguments;a.attr.call(a,b[0],b[1][0])},a.$family=function(){return!0};e.HighchartsAdapter.stop(a);c=new Fx.Morph(d?a:$(a),h({transition:Fx.Transitions.Quad.easeInOut},
-c));if(d)c.element=a;if(b.d)c.toD=b.d;f&&c.addEvent("complete",f);c.start(b);a.fx=c},each:function(a,b){return g?$each(a,b):Array.each(a,b)},map:function(a,b){return a.map(b)},grep:function(a,b){return a.filter(b)},merge:function(){var a=arguments,b=[{}],c=a.length;if(g)a=$merge.apply(null,a);else{for(;c--;)typeof a[c]!=="boolean"&&(b[c+1]=a[c]);a=Object.merge.apply(Object,b)}return a},offset:function(a){a=$(a).getOffsets();return{left:a.x,top:a.y}},extendWithEvents:function(a){a.addEvent||(a.nodeName?
-$(a):h(a,new Events))},addEvent:function(a,b,c){typeof b==="string"&&(b==="unload"&&(b="beforeunload"),e.HighchartsAdapter.extendWithEvents(a),a.addEvent(b,c))},removeEvent:function(a,b,c){typeof a!=="string"&&(e.HighchartsAdapter.extendWithEvents(a),b?(b==="unload"&&(b="beforeunload"),c?a.removeEvent(b,c):a.removeEvents&&a.removeEvents(b)):a.removeEvents())},fireEvent:function(a,b,c,d){b={type:b,target:a};b=j?new Event(b):new DOMEvent(b);b=h(b,c);b.preventDefault=function(){d=null};a.fireEvent&&
-a.fireEvent(b.type,b);d&&d(b)},washMouseEvent:function(a){a.pageX=a.page.x;a.pageY=a.page.y;return a},stop:function(a){a.fx&&a.fx.cancel()}}})();
diff --git a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.src.js b/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.src.js
deleted file mode 100644
index a3caf930..00000000
--- a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/mootools-adapter.src.js
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * @license Highcharts JS v2.2.5 (2012-06-08)
- * MooTools adapter
- *
- * (c) 2010-2011 Torstein H酶nsi
- *
- * License: www.highcharts.com/license
- */
-
-// JSLint options:
-/*global Fx, $, $extend, $each, $merge, Events, Event, DOMEvent */
-
-(function () {
-
-var win = window,
- doc = document,
- mooVersion = win.MooTools.version.substring(0, 3), // Get the first three characters of the version number
- legacy = mooVersion === '1.2' || mooVersion === '1.1', // 1.1 && 1.2 considered legacy, 1.3 is not.
- legacyEvent = legacy || mooVersion === '1.3', // In versions 1.1 - 1.3 the event class is named Event, in newer versions it is named DOMEvent.
- $extend = win.$extend || function () {
- return Object.append.apply(Object, arguments);
- };
-
-win.HighchartsAdapter = {
- /**
- * Initialize the adapter. This is run once as Highcharts is first run.
- * @param {Object} pathAnim The helper object to do animations across adapters.
- */
- init: function (pathAnim) {
- var fxProto = Fx.prototype,
- fxStart = fxProto.start,
- morphProto = Fx.Morph.prototype,
- morphCompute = morphProto.compute;
-
- // override Fx.start to allow animation of SVG element wrappers
- /*jslint unparam: true*//* allow unused parameters in fx functions */
- fxProto.start = function (from, to) {
- var fx = this,
- elem = fx.element;
-
- // special for animating paths
- if (from.d) {
- //this.fromD = this.element.d.split(' ');
- fx.paths = pathAnim.init(
- elem,
- elem.d,
- fx.toD
- );
- }
- fxStart.apply(fx, arguments);
-
- return this; // chainable
- };
-
- // override Fx.step to allow animation of SVG element wrappers
- morphProto.compute = function (from, to, delta) {
- var fx = this,
- paths = fx.paths;
-
- if (paths) {
- fx.element.attr(
- 'd',
- pathAnim.step(paths[0], paths[1], delta, fx.toD)
- );
- } else {
- return morphCompute.apply(fx, arguments);
- }
- };
- /*jslint unparam: false*/
- },
-
- /**
- * Run a general method on the framework, following jQuery syntax
- * @param {Object} el The HTML element
- * @param {String} method Which method to run on the wrapped element
- */
- adapterRun: function (el, method) {
-
- // This currently works for getting inner width and height. If adding
- // more methods later, we need a conditional implementation for each.
- return $(el).getStyle(method).toInt();
-
- },
-
- /**
- * Downloads a script and executes a callback when done.
- * @param {String} scriptLocation
- * @param {Function} callback
- */
- getScript: function (scriptLocation, callback) {
- // We cannot assume that Assets class from mootools-more is available so instead insert a script tag to download script.
- var head = doc.getElementsByTagName('head')[0];
- var script = doc.createElement('script');
-
- script.type = 'text/javascript';
- script.src = scriptLocation;
- script.onload = callback;
-
- head.appendChild(script);
- },
-
- /**
- * Animate a HTML element or SVG element wrapper
- * @param {Object} el
- * @param {Object} params
- * @param {Object} options jQuery-like animation options: duration, easing, callback
- */
- animate: function (el, params, options) {
- var isSVGElement = el.attr,
- effect,
- complete = options && options.complete;
-
- if (isSVGElement && !el.setStyle) {
- // add setStyle and getStyle methods for internal use in Moo
- el.getStyle = el.attr;
- el.setStyle = function () { // property value is given as array in Moo - break it down
- var args = arguments;
- el.attr.call(el, args[0], args[1][0]);
- };
- // dirty hack to trick Moo into handling el as an element wrapper
- el.$family = function () { return true; };
- }
-
- // stop running animations
- win.HighchartsAdapter.stop(el);
-
- // define and run the effect
- effect = new Fx.Morph(
- isSVGElement ? el : $(el),
- $extend({
- transition: Fx.Transitions.Quad.easeInOut
- }, options)
- );
-
- // Make sure that the element reference is set when animating svg elements
- if (isSVGElement) {
- effect.element = el;
- }
-
- // special treatment for paths
- if (params.d) {
- effect.toD = params.d;
- }
-
- // jQuery-like events
- if (complete) {
- effect.addEvent('complete', complete);
- }
-
- // run
- effect.start(params);
-
- // record for use in stop method
- el.fx = effect;
- },
-
- /**
- * MooTool's each function
- *
- */
- each: function (arr, fn) {
- return legacy ?
- $each(arr, fn) :
- Array.each(arr, fn);
- },
-
- /**
- * Map an array
- * @param {Array} arr
- * @param {Function} fn
- */
- map: function (arr, fn) {
- return arr.map(fn);
- },
-
- /**
- * Grep or filter an array
- * @param {Array} arr
- * @param {Function} fn
- */
- grep: function (arr, fn) {
- return arr.filter(fn);
- },
-
- /**
- * Deep merge two objects and return a third
- */
- merge: function () {
- var args = arguments,
- args13 = [{}], // MooTools 1.3+
- i = args.length,
- ret;
-
- if (legacy) {
- ret = $merge.apply(null, args);
- } else {
- while (i--) {
- // Boolean argumens should not be merged.
- // JQuery explicitly skips this, so we do it here as well.
- if (typeof args[i] !== 'boolean') {
- args13[i + 1] = args[i];
- }
- }
- ret = Object.merge.apply(Object, args13);
- }
-
- return ret;
- },
-
- /**
- * Get the offset of an element relative to the top left corner of the web page
- */
- offset: function (el) {
- var offsets = $(el).getOffsets();
- return {
- left: offsets.x,
- top: offsets.y
- };
- },
-
- /**
- * Extends an object with Events, if its not done
- */
- extendWithEvents: function (el) {
- // if the addEvent method is not defined, el is a custom Highcharts object
- // like series or point
- if (!el.addEvent) {
- if (el.nodeName) {
- el = $(el); // a dynamically generated node
- } else {
- $extend(el, new Events()); // a custom object
- }
- }
- },
-
- /**
- * Add an event listener
- * @param {Object} el HTML element or custom object
- * @param {String} type Event type
- * @param {Function} fn Event handler
- */
- addEvent: function (el, type, fn) {
- if (typeof type === 'string') { // chart broke due to el being string, type function
-
- if (type === 'unload') { // Moo self destructs before custom unload events
- type = 'beforeunload';
- }
-
- win.HighchartsAdapter.extendWithEvents(el);
-
- el.addEvent(type, fn);
- }
- },
-
- removeEvent: function (el, type, fn) {
- if (typeof el === 'string') {
- // el.removeEvents below apperantly calls this method again. Do not quite understand why, so for now just bail out.
- return;
- }
-
- win.HighchartsAdapter.extendWithEvents(el);
- if (type) {
- if (type === 'unload') { // Moo self destructs before custom unload events
- type = 'beforeunload';
- }
-
- if (fn) {
- el.removeEvent(type, fn);
- } else if (el.removeEvents) { // #958
- el.removeEvents(type);
- }
- } else {
- el.removeEvents();
- }
- },
-
- fireEvent: function (el, event, eventArguments, defaultFunction) {
- var eventArgs = {
- type: event,
- target: el
- };
- // create an event object that keeps all functions
- event = legacyEvent ? new Event(eventArgs) : new DOMEvent(eventArgs);
- event = $extend(event, eventArguments);
- // override the preventDefault function to be able to use
- // this for custom events
- event.preventDefault = function () {
- defaultFunction = null;
- };
- // if fireEvent is not available on the object, there hasn't been added
- // any events to it above
- if (el.fireEvent) {
- el.fireEvent(event.type, event);
- }
-
- // fire the default if it is passed and it is not prevented above
- if (defaultFunction) {
- defaultFunction(event);
- }
- },
-
- /**
- * Set back e.pageX and e.pageY that MooTools has abstracted away
- */
- washMouseEvent: function (e) {
- e.pageX = e.page.x;
- e.pageY = e.page.y;
- return e;
- },
-
- /**
- * Stop running animations on the object
- */
- stop: function (el) {
- if (el.fx) {
- el.fx.cancel();
- }
- }
-};
-
-}());
diff --git a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/prototype-adapter.js b/WebContent/plug-in/Highcharts-2.2.5/js/adapters/prototype-adapter.js
deleted file mode 100644
index 0a58d6b2..00000000
--- a/WebContent/plug-in/Highcharts-2.2.5/js/adapters/prototype-adapter.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Highcharts JS v2.2.5 (2012-06-08)
- Prototype adapter
-
- @author Michael Nelson, Torstein H?nsi.
-
- Feel free to use and modify this script.
- Highcharts license: www.highcharts.com/license.
-*/
-var HighchartsAdapter=function(){var g=typeof Effect!=="undefined";return{init:function(c){if(g)Effect.HighchartsTransition=Class.create(Effect.Base,{initialize:function(a,b,d,e){var f;this.element=a;this.key=b;f=a.attr?a.attr(b):$(a).getStyle(b);if(b==="d")this.paths=c.init(a,a.d,d),this.toD=d,f=0,d=1;this.start(Object.extend(e||{},{from:f,to:d,attribute:b}))},setup:function(){HighchartsAdapter._extend(this.element);if(!this.element._highchart_animation)this.element._highchart_animation={};this.element._highchart_animation[this.key]=
-this},update:function(a){var b=this.paths,d=this.element;b&&(a=c.step(b[0],b[1],a,this.toD));d.attr?d.attr(this.options.attribute,a):(b={},b[this.options.attribute]=a,$(d).setStyle(b))},finish:function(){delete this.element._highchart_animation[this.key]}})},adapterRun:function(c,a){return parseInt($(c).getStyle(a),10)},getScript:function(c,a){var b=$$("head")[0];b&&b.appendChild((new Element("script",{type:"text/javascript",src:c})).observe("load",a))},addNS:function(c){var a=/^(?:click|mouse(?:down|up|over|move|out))$/;
-return/^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/.test(c)||a.test(c)?c:"h:"+c},addEvent:function(c,a,b){c.addEventListener||c.attachEvent?Event.observe($(c),HighchartsAdapter.addNS(a),b):(HighchartsAdapter._extend(c),c._highcharts_observe(a,b))},animate:function(c,a,b){var d,b=b||{};b.delay=0;b.duration=(b.duration||500)/1E3;b.afterFinish=b.complete;if(g)for(d in a)new Effect.HighchartsTransition($(c),d,a[d],b);else{if(c.attr)for(d in a)c.attr(d,a[d]);b.complete&&
-b.complete()}c.attr||$(c).setStyle(a)},stop:function(c){var a;if(c._highcharts_extended&&c._highchart_animation)for(a in c._highchart_animation)c._highchart_animation[a].cancel()},each:function(c,a){$A(c).each(a)},offset:function(c){return $(c).cumulativeOffset()},fireEvent:function(c,a,b,d){c.fire?c.fire(HighchartsAdapter.addNS(a),b):c._highcharts_extended&&(b=b||{},c._highcharts_fire(a,b));b&&b.defaultPrevented&&(d=null);d&&d(b)},removeEvent:function(c,a,b){$(c).stopObserving&&(a&&(a=HighchartsAdapter.addNS(a)),
-$(c).stopObserving(a,b));window===c?Event.stopObserving(c,a,b):(HighchartsAdapter._extend(c),c._highcharts_stop_observing(a,b))},washMouseEvent:function(c){return c},grep:function(c,a){return c.findAll(a)},map:function(c,a){return c.map(a)},merge:function(){function c(a,b){var d,e;for(e in b)d=b[e],a[e]=d&&typeof d==="object"&&d.constructor!==Array&&typeof d.nodeType!=="number"?c(a[e]||{},d):b[e];return a}return function(){var a=arguments,b,d={};for(b=0;b',pointFormat:'{series.name}: {point.y}
',shadow:!0,shared:ga,snap:ea?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5}, -style:{cursor:"pointer",color:"#909090",fontSize:"10px"}}};var Z=V.plotOptions,T=Z.line;Bb();var pa=function(a){var b=[],c;(function(a){(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a))?b=[w(c[1]),w(c[2]),w(c[3]),parseFloat(c[4],10)]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a))&&(b=[w(c[1],16),w(c[2],16),w(c[3],16),1])})(a);return{get:function(c){return b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]: -"rgba("+b.join(",")+")":a},brighten:function(a){if(Ka(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=w(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},setOpacity:function(a){b[3]=a;return this}}};va.prototype={init:function(a,b){this.element=b==="span"?S(b):B.createElementNS("http://www.w3.org/2000/svg",b);this.renderer=a;this.attrSetters={}},animate:function(a,b,c){b=o(b,Ra,!0);Fa(this);if(b){b=C(b);if(c)b.complete=c;eb(this,a,b)}else this.attr(a),c&&c()},attr:function(a,b){var c,d,e,f,g=this.element, -h=g.nodeName,i=this.renderer,j,k=this.attrSetters,l=this.shadows,m,p,q=this;ra(a)&&s(b)&&(c=a,a={},a[c]=b);if(ra(a))c=a,h==="circle"?c={x:"cx",y:"cy"}[c]||c:c==="strokeWidth"&&(c="stroke-width"),q=z(g,c)||this[c]||0,c!=="d"&&c!=="visibility"&&(q=parseFloat(q));else for(c in a)if(j=!1,d=a[c],e=k[c]&&k[c](d,c),e!==!1){e!==A&&(d=e);if(c==="d")d&&d.join&&(d=d.join(" ")),/(NaN| {2}|^$)/.test(d)&&(d="M 0 0");else if(c==="x"&&h==="text"){for(e=0;e
',pointFormat:"x: {point.x}
y: {point.y}
"}});Ia=ca(R,{type:"scatter",sorted:!1,translate:function(){var a=this;R.prototype.translate.apply(a);n(a.points,function(b){b.shapeType="circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){for(var a=this,b=a.options.cursor,b=b&&{cursor:b},c=a.points,d=c.length,e;d--;)if(e=c[d].graphic)e.element._i= -d;a._hasTracking?a._hasTracking=!0:a.group.attr({isTracker:!0}).on(ea?"touchstart":"mouseover",function(b){a.onMouseOver();if(b.target._i!==A)c[b.target._i].onMouseOver()}).on("mouseout",function(){if(!a.options.stickyTracking)a.onMouseOut()}).css(b)}});Y.scatter=Ia;Z.pie=C(T,{borderColor:"#FFFFFF",borderWidth:1,center:["50%","50%"],colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},y:5},legendType:"point",marker:null,size:"75%",showInLegend:!1,slicedOffset:10, -states:{hover:{brightness:0.1,shadow:!1}}});T={type:"pie",isCartesian:!1,pointClass:ca(Wa,{init:function(){Wa.prototype.init.apply(this,arguments);var a=this,b;u(a,{visible:a.visible!==!1,name:o(a.name,"Slice")});b=function(){a.slice()};I(a,"select",b);I(a,"unselect",b);return a},setVisible:function(a){var b=this.series.chart,c=this.tracker,d=this.dataLabel,e=this.connector,f=this.shadowGroup,g;g=(this.visible=a=a===A?!this.visible:a)?"show":"hide";this.group[g]();if(c)c[g]();if(d)d[g]();if(e)e[g](); -if(f)f[g]();this.legendItem&&b.legend.colorizeItem(this,a)},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;ua(c,d);o(b,!0);a=this.sliced=s(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop};this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}}),pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},animate:function(){var a=this;n(a.points, -function(b){var c=b.graphic,b=b.shapeArgs,d=-xa/2;c&&(c.attr({r:0,start:d,end:d}),c.animate({r:b.r,start:b.start,end:b.end},a.options.animation))});a.animate=null},setData:function(a,b){R.prototype.setData.call(this,a,!1);this.processData();this.generatePoints();o(b,!0)&&this.chart.redraw()},getCenter:function(){var a=this.options,b=this.chart,c=b.plotWidth,d=b.plotHeight,a=a.center.concat([a.size,a.innerSize||0]),e=O(c,d),f;return Ea(a,function(a,b){return(f=/%$/.test(a))?[c,d,e,e][b]*w(a)/100:a})}, -translate:function(){this.generatePoints();var a=0,b=-0.25,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g=this.chart,h,i,j,k=this.points,l=2*xa,m,p,o,s=c.dataLabels.distance;this.center=f=this.getCenter();this.getX=function(a,b){j=L.asin((a-f[1])/(f[2]/2+s));return f[0]+(b?-1:1)*X(j)*(f[2]/2+s)};n(k,function(b){a+=b.y});n(k,function(c){m=a?c.y/a:0;h=t(b*l*1E3)/1E3;b+=m;i=t(b*l*1E3)/1E3;c.shapeType="arc";c.shapeArgs={x:f[0],y:f[1],r:f[2]/2,innerR:f[3]/2,start:h,end:i};j=(i+h)/2;c.slicedTranslation= -Ea([X(j)*d+g.plotLeft,da(j)*d+g.plotTop],t);p=X(j)*f[2]/2;o=da(j)*f[2]/2;c.tooltipPos=[f[0]+p*0.7,f[1]+o*0.7];c.labelPos=[f[0]+p+X(j)*s,f[1]+o+da(j)*s,f[0]+p+X(j)*e,f[1]+o+da(j)*e,f[0]+p,f[1]+o,s<0?"center":j
', - pointFormat: '{series.name}: {point.y}
', - shadow: true, - shared: useCanVG, - snap: hasTouch ? 25 : 10, - style: { - color: '#333333', - fontSize: '12px', - padding: '5px', - whiteSpace: 'nowrap' - } - //xDateFormat: '%A, %b %e, %Y', - //valueDecimals: null, - //valuePrefix: '', - //valueSuffix: '' - }, - - credits: { - enabled: true, - text: '', - href: '', - position: { - align: 'right', - x: -10, - verticalAlign: 'bottom', - y: -5 - }, - style: { - cursor: 'pointer', - color: '#909090', - fontSize: '10px' - } - } -}; - - - - -// Series defaults -var defaultPlotOptions = defaultOptions.plotOptions, - defaultSeriesOptions = defaultPlotOptions.line; - -// set the default time methods -setTimeMethods(); - - - -/** - * Set the time methods globally based on the useUTC option. Time method can be either - * local time or UTC (default). - */ -function setTimeMethods() { - var useUTC = defaultOptions.global.useUTC, - GET = useUTC ? 'getUTC' : 'get', - SET = useUTC ? 'setUTC' : 'set'; - - makeTime = useUTC ? Date.UTC : function (year, month, date, hours, minutes, seconds) { - return new Date( - year, - month, - pick(date, 1), - pick(hours, 0), - pick(minutes, 0), - pick(seconds, 0) - ).getTime(); - }; - getMinutes = GET + 'Minutes'; - getHours = GET + 'Hours'; - getDay = GET + 'Day'; - getDate = GET + 'Date'; - getMonth = GET + 'Month'; - getFullYear = GET + 'FullYear'; - setMinutes = SET + 'Minutes'; - setHours = SET + 'Hours'; - setDate = SET + 'Date'; - setMonth = SET + 'Month'; - setFullYear = SET + 'FullYear'; - -} - -/** - * Merge the default options with custom options and return the new options structure - * @param {Object} options The new custom options - */ -function setOptions(options) { - - // Pull out axis options and apply them to the respective default axis options - /*defaultXAxisOptions = merge(defaultXAxisOptions, options.xAxis); - defaultYAxisOptions = merge(defaultYAxisOptions, options.yAxis); - options.xAxis = options.yAxis = UNDEFINED;*/ - - // Merge in the default options - defaultOptions = merge(defaultOptions, options); - - // Apply UTC - setTimeMethods(); - - return defaultOptions; -} - -/** - * Get the updated default options. Merely exposing defaultOptions for outside modules - * isn't enough because the setOptions method creates a new object. - */ -function getOptions() { - return defaultOptions; -} - - - -/** - * Handle color operations. The object methods are chainable. - * @param {String} input The input color in either rbga or hex format - */ -var Color = function (input) { - // declare variables - var rgba = [], result; - - /** - * Parse the input color to rgba array - * @param {String} input - */ - function init(input) { - - // rgba - result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(input); - if (result) { - rgba = [pInt(result[1]), pInt(result[2]), pInt(result[3]), parseFloat(result[4], 10)]; - } else { // hex - result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(input); - if (result) { - rgba = [pInt(result[1], 16), pInt(result[2], 16), pInt(result[3], 16), 1]; - } - } - - } - /** - * Return the color a specified format - * @param {String} format - */ - function get(format) { - var ret; - - // it's NaN if gradient colors on a column chart - if (rgba && !isNaN(rgba[0])) { - if (format === 'rgb') { - ret = 'rgb(' + rgba[0] + ',' + rgba[1] + ',' + rgba[2] + ')'; - } else if (format === 'a') { - ret = rgba[3]; - } else { - ret = 'rgba(' + rgba.join(',') + ')'; - } - } else { - ret = input; - } - return ret; - } - - /** - * Brighten the color - * @param {Number} alpha - */ - function brighten(alpha) { - if (isNumber(alpha) && alpha !== 0) { - var i; - for (i = 0; i < 3; i++) { - rgba[i] += pInt(alpha * 255); - - if (rgba[i] < 0) { - rgba[i] = 0; - } - if (rgba[i] > 255) { - rgba[i] = 255; - } - } - } - return this; - } - /** - * Set the color's opacity to a given alpha value - * @param {Number} alpha - */ - function setOpacity(alpha) { - rgba[3] = alpha; - return this; - } - - // initialize: parse the input - init(input); - - // public methods - return { - get: get, - brighten: brighten, - setOpacity: setOpacity - }; -}; - - -/** - * A wrapper object for SVG elements - */ -function SVGElement() {} - -SVGElement.prototype = { - /** - * Initialize the SVG renderer - * @param {Object} renderer - * @param {String} nodeName - */ - init: function (renderer, nodeName) { - var wrapper = this; - wrapper.element = nodeName === 'span' ? - createElement(nodeName) : - doc.createElementNS(SVG_NS, nodeName); - wrapper.renderer = renderer; - /** - * A collection of attribute setters. These methods, if defined, are called right before a certain - * attribute is set on an element wrapper. Returning false prevents the default attribute - * setter to run. Returning a value causes the default setter to set that value. Used in - * Renderer.label. - */ - wrapper.attrSetters = {}; - }, - /** - * Animate a given attribute - * @param {Object} params - * @param {Number} options The same options as in jQuery animation - * @param {Function} complete Function to perform at the end of animation - */ - animate: function (params, options, complete) { - var animOptions = pick(options, globalAnimation, true); - stop(this); // stop regardless of animation actually running, or reverting to .attr (#607) - if (animOptions) { - animOptions = merge(animOptions); - if (complete) { // allows using a callback with the global animation without overwriting it - animOptions.complete = complete; - } - animate(this, params, animOptions); - } else { - this.attr(params); - if (complete) { - complete(); - } - } - }, - /** - * Set or get a given attribute - * @param {Object|String} hash - * @param {Mixed|Undefined} val - */ - attr: function (hash, val) { - var wrapper = this, - key, - value, - result, - i, - child, - element = wrapper.element, - nodeName = element.nodeName, - renderer = wrapper.renderer, - skipAttr, - titleNode, - attrSetters = wrapper.attrSetters, - shadows = wrapper.shadows, - hasSetSymbolSize, - doTransform, - ret = wrapper; - - // single key-value pair - if (isString(hash) && defined(val)) { - key = hash; - hash = {}; - hash[key] = val; - } - - // used as a getter: first argument is a string, second is undefined - if (isString(hash)) { - key = hash; - if (nodeName === 'circle') { - key = { x: 'cx', y: 'cy' }[key] || key; - } else if (key === 'strokeWidth') { - key = 'stroke-width'; - } - ret = attr(element, key) || wrapper[key] || 0; - - if (key !== 'd' && key !== 'visibility') { // 'd' is string in animation step - ret = parseFloat(ret); - } - - // setter - } else { - - for (key in hash) { - skipAttr = false; // reset - value = hash[key]; - - // check for a specific attribute setter - result = attrSetters[key] && attrSetters[key](value, key); - - if (result !== false) { - if (result !== UNDEFINED) { - value = result; // the attribute setter has returned a new value to set - } - - // paths - if (key === 'd') { - if (value && value.join) { // join path - value = value.join(' '); - } - if (/(NaN| {2}|^$)/.test(value)) { - value = 'M 0 0'; - } - //wrapper.d = value; // shortcut for animations - - // update child tspans x values - } else if (key === 'x' && nodeName === 'text') { - for (i = 0; i < element.childNodes.length; i++) { - child = element.childNodes[i]; - // if the x values are equal, the tspan represents a linebreak - if (attr(child, 'x') === attr(element, 'x')) { - //child.setAttribute('x', value); - attr(child, 'x', value); - } - } - - if (wrapper.rotation) { - attr(element, 'transform', 'rotate(' + wrapper.rotation + ' ' + value + ' ' + - pInt(hash.y || attr(element, 'y')) + ')'); - } - - // apply gradients - } else if (key === 'fill') { - value = renderer.color(value, element, key); - - // circle x and y - } else if (nodeName === 'circle' && (key === 'x' || key === 'y')) { - key = { x: 'cx', y: 'cy' }[key] || key; - - // rectangle border radius - } else if (nodeName === 'rect' && key === 'r') { - attr(element, { - rx: value, - ry: value - }); - skipAttr = true; - - // translation and text rotation - } else if (key === 'translateX' || key === 'translateY' || key === 'rotation' || key === 'verticalAlign') { - doTransform = true; - skipAttr = true; - - // apply opacity as subnode (required by legacy WebKit and Batik) - } else if (key === 'stroke') { - value = renderer.color(value, element, key); - - // emulate VML's dashstyle implementation - } else if (key === 'dashstyle') { - key = 'stroke-dasharray'; - value = value && value.toLowerCase(); - if (value === 'solid') { - value = NONE; - } else if (value) { - value = value - .replace('shortdashdotdot', '3,1,1,1,1,1,') - .replace('shortdashdot', '3,1,1,1') - .replace('shortdot', '1,1,') - .replace('shortdash', '3,1,') - .replace('longdash', '8,3,') - .replace(/dot/g, '1,3,') - .replace('dash', '4,3,') - .replace(/,$/, '') - .split(','); // ending comma - - i = value.length; - while (i--) { - value[i] = pInt(value[i]) * hash['stroke-width']; - } - value = value.join(','); - } - - // special - } else if (key === 'isTracker') { - wrapper[key] = value; - - // IE9/MooTools combo: MooTools returns objects instead of numbers and IE9 Beta 2 - // is unable to cast them. Test again with final IE9. - } else if (key === 'width') { - value = pInt(value); - - // Text alignment - } else if (key === 'align') { - key = 'text-anchor'; - value = { left: 'start', center: 'middle', right: 'end' }[value]; - - // Title requires a subnode, #431 - } else if (key === 'title') { - titleNode = element.getElementsByTagName('title')[0]; - if (!titleNode) { - titleNode = doc.createElementNS(SVG_NS, 'title'); - element.appendChild(titleNode); - } - titleNode.textContent = value; - } - - // jQuery animate changes case - if (key === 'strokeWidth') { - key = 'stroke-width'; - } - - // Chrome/Win < 6 bug (http://code.google.com/p/chromium/issues/detail?id=15461) - if (isWebKit && key === 'stroke-width' && value === 0) { - value = 0.000001; - } - - // symbols - if (wrapper.symbolName && /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(key)) { - - - if (!hasSetSymbolSize) { - wrapper.symbolAttr(hash); - hasSetSymbolSize = true; - } - skipAttr = true; - } - - // let the shadow follow the main element - if (shadows && /^(width|height|visibility|x|y|d|transform)$/.test(key)) { - i = shadows.length; - while (i--) { - attr( - shadows[i], - key, - key === 'height' ? - mathMax(value - (shadows[i].cutHeight || 0), 0) : - value - ); - } - } - - // validate heights - if ((key === 'width' || key === 'height') && nodeName === 'rect' && value < 0) { - value = 0; - } - - // Record for animation and quick access without polling the DOM - wrapper[key] = value; - - // Update transform - if (doTransform) { - wrapper.updateTransform(); - } - - - if (key === 'text') { - // only one node allowed - wrapper.textStr = value; - if (wrapper.added) { - renderer.buildText(wrapper); - } - } else if (!skipAttr) { - attr(element, key, value); - } - - } - - } - - } - - // Workaround for our #732, WebKit's issue https://bugs.webkit.org/show_bug.cgi?id=78385 - // TODO: If the WebKit team fix this bug before the final release of Chrome 18, remove the workaround. - if (isWebKit && /Chrome\/(18|19)/.test(userAgent)) { - if (nodeName === 'text' && (hash.x !== UNDEFINED || hash.y !== UNDEFINED)) { - var parent = element.parentNode, - next = element.nextSibling; - - if (parent) { - parent.removeChild(element); - if (next) { - parent.insertBefore(element, next); - } else { - parent.appendChild(element); - } - } - } - } - // End of workaround for #732 - - return ret; - }, - - /** - * If one of the symbol size affecting parameters are changed, - * check all the others only once for each call to an element's - * .attr() method - * @param {Object} hash - */ - symbolAttr: function (hash) { - var wrapper = this; - - each(['x', 'y', 'r', 'start', 'end', 'width', 'height', 'innerR', 'anchorX', 'anchorY'], function (key) { - wrapper[key] = pick(hash[key], wrapper[key]); - }); - - wrapper.attr({ - d: wrapper.renderer.symbols[wrapper.symbolName](wrapper.x, wrapper.y, wrapper.width, wrapper.height, wrapper) - }); - }, - - /** - * Apply a clipping path to this object - * @param {String} id - */ - clip: function (clipRect) { - return this.attr('clip-path', 'url(' + this.renderer.url + '#' + clipRect.id + ')'); - }, - - /** - * Calculate the coordinates needed for drawing a rectangle crisply and return the - * calculated attributes - * @param {Number} strokeWidth - * @param {Number} x - * @param {Number} y - * @param {Number} width - * @param {Number} height - */ - crisp: function (strokeWidth, x, y, width, height) { - - var wrapper = this, - key, - attribs = {}, - values = {}, - normalizer; - - strokeWidth = strokeWidth || wrapper.strokeWidth || (wrapper.attr && wrapper.attr('stroke-width')) || 0; - normalizer = mathRound(strokeWidth) % 2 / 2; // mathRound because strokeWidth can sometimes have roundoff errors - - // normalize for crisp edges - values.x = mathFloor(x || wrapper.x || 0) + normalizer; - values.y = mathFloor(y || wrapper.y || 0) + normalizer; - values.width = mathFloor((width || wrapper.width || 0) - 2 * normalizer); - values.height = mathFloor((height || wrapper.height || 0) - 2 * normalizer); - values.strokeWidth = strokeWidth; - - for (key in values) { - if (wrapper[key] !== values[key]) { // only set attribute if changed - wrapper[key] = attribs[key] = values[key]; - } - } - - return attribs; - }, - - /** - * Set styles for the element - * @param {Object} styles - */ - css: function (styles) { - /*jslint unparam: true*//* allow unused param a in the regexp function below */ - var elemWrapper = this, - elem = elemWrapper.element, - textWidth = styles && styles.width && elem.nodeName === 'text', - n, - serializedCss = '', - hyphenate = function (a, b) { return '-' + b.toLowerCase(); }; - /*jslint unparam: false*/ - - // convert legacy - if (styles && styles.color) { - styles.fill = styles.color; - } - - // Merge the new styles with the old ones - styles = extend( - elemWrapper.styles, - styles - ); - - // store object - elemWrapper.styles = styles; - - // serialize and set style attribute - if (isIE && !hasSVG) { // legacy IE doesn't support setting style attribute - if (textWidth) { - delete styles.width; - } - css(elemWrapper.element, styles); - } else { - for (n in styles) { - serializedCss += n.replace(/([A-Z])/g, hyphenate) + ':' + styles[n] + ';'; - } - elemWrapper.attr({ - style: serializedCss - }); - } - - - // re-build text - if (textWidth && elemWrapper.added) { - elemWrapper.renderer.buildText(elemWrapper); - } - - return elemWrapper; - }, - - /** - * Add an event listener - * @param {String} eventType - * @param {Function} handler - */ - on: function (eventType, handler) { - var fn = handler; - // touch - if (hasTouch && eventType === 'click') { - eventType = 'touchstart'; - fn = function (e) { - e.preventDefault(); - handler(); - }; - } - // simplest possible event model for internal use - this.element['on' + eventType] = fn; - return this; - }, - - /** - * Set the coordinates needed to draw a consistent radial gradient across - * pie slices regardless of positioning inside the chart. The format is - * [centerX, centerY, diameter] in pixels. - */ - setRadialReference: function (coordinates) { - this.element.radialReference = coordinates; - return this; - }, - - /** - * Move an object and its children by x and y values - * @param {Number} x - * @param {Number} y - */ - translate: function (x, y) { - return this.attr({ - translateX: x, - translateY: y - }); - }, - - /** - * Invert a group, rotate and flip - */ - invert: function () { - var wrapper = this; - wrapper.inverted = true; - wrapper.updateTransform(); - return wrapper; - }, - - /** - * Apply CSS to HTML elements. This is used in text within SVG rendering and - * by the VML renderer - */ - htmlCss: function (styles) { - var wrapper = this, - element = wrapper.element, - textWidth = styles && element.tagName === 'SPAN' && styles.width; - - if (textWidth) { - delete styles.width; - wrapper.textWidth = textWidth; - wrapper.updateTransform(); - } - - wrapper.styles = extend(wrapper.styles, styles); - css(wrapper.element, styles); - - return wrapper; - }, - - - - /** - * VML and useHTML method for calculating the bounding box based on offsets - * @param {Boolean} refresh Whether to force a fresh value from the DOM or to - * use the cached value - * - * @return {Object} A hash containing values for x, y, width and height - */ - - htmlGetBBox: function (refresh) { - var wrapper = this, - element = wrapper.element, - bBox = wrapper.bBox; - - // faking getBBox in exported SVG in legacy IE - if (!bBox || refresh) { - // faking getBBox in exported SVG in legacy IE - if (element.nodeName === 'text') { - element.style.position = ABSOLUTE; - } - - bBox = wrapper.bBox = { - x: element.offsetLeft, - y: element.offsetTop, - width: element.offsetWidth, - height: element.offsetHeight - }; - } - - return bBox; - }, - - /** - * VML override private method to update elements based on internal - * properties based on SVG transform - */ - htmlUpdateTransform: function () { - // aligning non added elements is expensive - if (!this.added) { - this.alignOnAdd = true; - return; - } - - var wrapper = this, - renderer = wrapper.renderer, - elem = wrapper.element, - translateX = wrapper.translateX || 0, - translateY = wrapper.translateY || 0, - x = wrapper.x || 0, - y = wrapper.y || 0, - align = wrapper.textAlign || 'left', - alignCorrection = { left: 0, center: 0.5, right: 1 }[align], - nonLeft = align && align !== 'left', - shadows = wrapper.shadows; - - // apply translate - if (translateX || translateY) { - css(elem, { - marginLeft: translateX, - marginTop: translateY - }); - if (shadows) { // used in labels/tooltip - each(shadows, function (shadow) { - css(shadow, { - marginLeft: translateX + 1, - marginTop: translateY + 1 - }); - }); - } - } - - // apply inversion - if (wrapper.inverted) { // wrapper is a group - each(elem.childNodes, function (child) { - renderer.invertChild(child, elem); - }); - } - - if (elem.tagName === 'SPAN') { - - var width, height, - rotation = wrapper.rotation, - baseline, - radians = 0, - costheta = 1, - sintheta = 0, - quad, - textWidth = pInt(wrapper.textWidth), - xCorr = wrapper.xCorr || 0, - yCorr = wrapper.yCorr || 0, - currentTextTransform = [rotation, align, elem.innerHTML, wrapper.textWidth].join(','); - - if (currentTextTransform !== wrapper.cTT) { // do the calculations and DOM access only if properties changed - - if (defined(rotation)) { - radians = rotation * deg2rad; // deg to rad - costheta = mathCos(radians); - sintheta = mathSin(radians); - - // Adjust for alignment and rotation. Rotation of useHTML content is not yet implemented - // but it can probably be implemented for Firefox 3.5+ on user request. FF3.5+ - // has support for CSS3 transform. The getBBox method also needs to be updated - // to compensate for the rotation, like it currently does for SVG. - // Test case: http://highcharts.com/tests/?file=text-rotation - css(elem, { - filter: rotation ? ['progid:DXImageTransform.Microsoft.Matrix(M11=', costheta, - ', M12=', -sintheta, ', M21=', sintheta, ', M22=', costheta, - ', sizingMethod=\'auto expand\')'].join('') : NONE - }); - } - - width = pick(wrapper.elemWidth, elem.offsetWidth); - height = pick(wrapper.elemHeight, elem.offsetHeight); - - // update textWidth - if (width > textWidth && /[ \-]/.test(elem.innerText)) { // #983 - css(elem, { - width: textWidth + PX, - display: 'block', - whiteSpace: 'normal' - }); - width = textWidth; - } - - // correct x and y - baseline = renderer.fontMetrics(elem.style.fontSize).b; - xCorr = costheta < 0 && -width; - yCorr = sintheta < 0 && -height; - - // correct for baseline and corners spilling out after rotation - quad = costheta * sintheta < 0; - xCorr += sintheta * baseline * (quad ? 1 - alignCorrection : alignCorrection); - yCorr -= costheta * baseline * (rotation ? (quad ? alignCorrection : 1 - alignCorrection) : 1); - - // correct for the length/height of the text - if (nonLeft) { - xCorr -= width * alignCorrection * (costheta < 0 ? -1 : 1); - if (rotation) { - yCorr -= height * alignCorrection * (sintheta < 0 ? -1 : 1); - } - css(elem, { - textAlign: align - }); - } - - // record correction - wrapper.xCorr = xCorr; - wrapper.yCorr = yCorr; - } - - // apply position with correction - css(elem, { - left: (x + xCorr) + PX, - top: (y + yCorr) + PX - }); - - // record current text transform - wrapper.cTT = currentTextTransform; - } - }, - - /** - * Private method to update the transform attribute based on internal - * properties - */ - updateTransform: function () { - var wrapper = this, - translateX = wrapper.translateX || 0, - translateY = wrapper.translateY || 0, - inverted = wrapper.inverted, - rotation = wrapper.rotation, - transform = []; - - // flipping affects translate as adjustment for flipping around the group's axis - if (inverted) { - translateX += wrapper.attr('width'); - translateY += wrapper.attr('height'); - } - - // apply translate - if (translateX || translateY) { - transform.push('translate(' + translateX + ',' + translateY + ')'); - } - - // apply rotation - if (inverted) { - transform.push('rotate(90) scale(-1,1)'); - } else if (rotation) { // text rotation - transform.push('rotate(' + rotation + ' ' + (wrapper.x || 0) + ' ' + (wrapper.y || 0) + ')'); - } - - if (transform.length) { - attr(wrapper.element, 'transform', transform.join(' ')); - } - }, - /** - * Bring the element to the front - */ - toFront: function () { - var element = this.element; - element.parentNode.appendChild(element); - return this; - }, - - - /** - * Break down alignment options like align, verticalAlign, x and y - * to x and y relative to the chart. - * - * @param {Object} alignOptions - * @param {Boolean} alignByTranslate - * @param {Object} box The box to align to, needs a width and height - * - */ - align: function (alignOptions, alignByTranslate, box) { - var elemWrapper = this; - - if (!alignOptions) { // called on resize - alignOptions = elemWrapper.alignOptions; - alignByTranslate = elemWrapper.alignByTranslate; - } else { // first call on instanciate - elemWrapper.alignOptions = alignOptions; - elemWrapper.alignByTranslate = alignByTranslate; - if (!box) { // boxes other than renderer handle this internally - elemWrapper.renderer.alignedObjects.push(elemWrapper); - } - } - - box = pick(box, elemWrapper.renderer); - - var align = alignOptions.align, - vAlign = alignOptions.verticalAlign, - x = (box.x || 0) + (alignOptions.x || 0), // default: left align - y = (box.y || 0) + (alignOptions.y || 0), // default: top align - attribs = {}; - - - // align - if (/^(right|center)$/.test(align)) { - x += (box.width - (alignOptions.width || 0)) / - { right: 1, center: 2 }[align]; - } - attribs[alignByTranslate ? 'translateX' : 'x'] = mathRound(x); - - - // vertical align - if (/^(bottom|middle)$/.test(vAlign)) { - y += (box.height - (alignOptions.height || 0)) / - ({ bottom: 1, middle: 2 }[vAlign] || 1); - - } - attribs[alignByTranslate ? 'translateY' : 'y'] = mathRound(y); - - // animate only if already placed - elemWrapper[elemWrapper.placed ? 'animate' : 'attr'](attribs); - elemWrapper.placed = true; - elemWrapper.alignAttr = attribs; - - return elemWrapper; - }, - - /** - * Get the bounding box (width, height, x and y) for the element - */ - getBBox: function (refresh) { - var wrapper = this, - bBox, - width, - height, - rotation = wrapper.rotation, - element = wrapper.element, - rad = rotation * deg2rad; - - // SVG elements - if (element.namespaceURI === SVG_NS || wrapper.renderer.forExport) { - try { // Fails in Firefox if the container has display: none. - - bBox = element.getBBox ? - // SVG: use extend because IE9 is not allowed to change width and height in case - // of rotation (below) - extend({}, element.getBBox()) : - // Canvas renderer and legacy IE in export mode - { - width: element.offsetWidth, - height: element.offsetHeight - }; - } catch (e) {} - - // If the bBox is not set, the try-catch block above failed. The other condition - // is for Opera that returns a width of -Infinity on hidden elements. - if (!bBox || bBox.width < 0) { - bBox = { width: 0, height: 0 }; - } - - width = bBox.width; - height = bBox.height; - - // adjust for rotated text - if (rotation) { - bBox.width = mathAbs(height * mathSin(rad)) + mathAbs(width * mathCos(rad)); - bBox.height = mathAbs(height * mathCos(rad)) + mathAbs(width * mathSin(rad)); - } - - // VML Renderer or useHTML within SVG - } else { - bBox = wrapper.htmlGetBBox(refresh); - } - - return bBox; - }, - - /** - * Show the element - */ - show: function () { - return this.attr({ visibility: VISIBLE }); - }, - - /** - * Hide the element - */ - hide: function () { - return this.attr({ visibility: HIDDEN }); - }, - - /** - * Add the element - * @param {Object|Undefined} parent Can be an element, an element wrapper or undefined - * to append the element to the renderer.box. - */ - add: function (parent) { - - var renderer = this.renderer, - parentWrapper = parent || renderer, - parentNode = parentWrapper.element || renderer.box, - childNodes = parentNode.childNodes, - element = this.element, - zIndex = attr(element, 'zIndex'), - otherElement, - otherZIndex, - i, - inserted; - - // mark as inverted - this.parentInverted = parent && parent.inverted; - - // build formatted text - if (this.textStr !== undefined) { - renderer.buildText(this); - } - - // mark the container as having z indexed children - if (zIndex) { - parentWrapper.handleZ = true; - zIndex = pInt(zIndex); - } - - // insert according to this and other elements' zIndex - if (parentWrapper.handleZ) { // this element or any of its siblings has a z index - for (i = 0; i < childNodes.length; i++) { - otherElement = childNodes[i]; - otherZIndex = attr(otherElement, 'zIndex'); - if (otherElement !== element && ( - // insert before the first element with a higher zIndex - pInt(otherZIndex) > zIndex || - // if no zIndex given, insert before the first element with a zIndex - (!defined(zIndex) && defined(otherZIndex)) - - )) { - parentNode.insertBefore(element, otherElement); - inserted = true; - break; - } - } - } - - // default: append at the end - if (!inserted) { - parentNode.appendChild(element); - } - - // mark as added - this.added = true; - - // fire an event for internal hooks - fireEvent(this, 'add'); - - return this; - }, - - /** - * Removes a child either by removeChild or move to garbageBin. - * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not. - */ - safeRemoveChild: function (element) { - var parentNode = element.parentNode; - if (parentNode) { - parentNode.removeChild(element); - } - }, - - /** - * Destroy the element and element wrapper - */ - destroy: function () { - var wrapper = this, - element = wrapper.element || {}, - shadows = wrapper.shadows, - box = wrapper.box, - key, - i; - - // remove events - element.onclick = element.onmouseout = element.onmouseover = element.onmousemove = null; - stop(wrapper); // stop running animations - - if (wrapper.clipPath) { - wrapper.clipPath = wrapper.clipPath.destroy(); - } - - // Destroy stops in case this is a gradient object - if (wrapper.stops) { - for (i = 0; i < wrapper.stops.length; i++) { - wrapper.stops[i] = wrapper.stops[i].destroy(); - } - wrapper.stops = null; - } - - // remove element - wrapper.safeRemoveChild(element); - - // destroy shadows - if (shadows) { - each(shadows, function (shadow) { - wrapper.safeRemoveChild(shadow); - }); - } - - // destroy label box - if (box) { - box.destroy(); - } - - // remove from alignObjects - erase(wrapper.renderer.alignedObjects, wrapper); - - for (key in wrapper) { - delete wrapper[key]; - } - - return null; - }, - - /** - * Empty a group element - */ - empty: function () { - var element = this.element, - childNodes = element.childNodes, - i = childNodes.length; - - while (i--) { - element.removeChild(childNodes[i]); - } - }, - - /** - * Add a shadow to the element. Must be done after the element is added to the DOM - * @param {Boolean} apply - */ - shadow: function (apply, group, cutOff) { - var shadows = [], - i, - shadow, - element = this.element, - strokeWidth, - - // compensate for inverted plot area - transform = this.parentInverted ? '(-1,-1)' : '(1,1)'; - - - if (apply) { - for (i = 1; i <= 3; i++) { - shadow = element.cloneNode(0); - strokeWidth = 7 - 2 * i; - attr(shadow, { - 'isShadow': 'true', - 'stroke': 'rgb(0, 0, 0)', - 'stroke-opacity': 0.05 * i, - 'stroke-width': strokeWidth, - 'transform': 'translate' + transform, - 'fill': NONE - }); - if (cutOff) { - attr(shadow, 'height', mathMax(attr(shadow, 'height') - strokeWidth, 0)); - shadow.cutHeight = strokeWidth; - } - - if (group) { - group.element.appendChild(shadow); - } else { - element.parentNode.insertBefore(shadow, element); - } - - shadows.push(shadow); - } - - this.shadows = shadows; - } - return this; - - } -}; - - -/** - * The default SVG renderer - */ -var SVGRenderer = function () { - this.init.apply(this, arguments); -}; -SVGRenderer.prototype = { - Element: SVGElement, - - /** - * Initialize the SVGRenderer - * @param {Object} container - * @param {Number} width - * @param {Number} height - * @param {Boolean} forExport - */ - init: function (container, width, height, forExport) { - var renderer = this, - loc = location, - boxWrapper; - - boxWrapper = renderer.createElement('svg') - .attr({ - xmlns: SVG_NS, - version: '1.1' - }); - container.appendChild(boxWrapper.element); - - // object properties - renderer.isSVG = true; - renderer.box = boxWrapper.element; - renderer.boxWrapper = boxWrapper; - renderer.alignedObjects = []; - renderer.url = isIE ? '' : loc.href.replace(/#.*?$/, '') - .replace(/([\('\)])/g, '\\$1'); // Page url used for internal references. #24, #672. - renderer.defs = this.createElement('defs').add(); - renderer.forExport = forExport; - renderer.gradients = {}; // Object where gradient SvgElements are stored - - renderer.setSize(width, height, false); - - - - // Issue 110 workaround: - // In Firefox, if a div is positioned by percentage, its pixel position may land - // between pixels. The container itself doesn't display this, but an SVG element - // inside this container will be drawn at subpixel precision. In order to draw - // sharp lines, this must be compensated for. This doesn't seem to work inside - // iframes though (like in jsFiddle). - var subPixelFix, rect; - if (isFirefox && container.getBoundingClientRect) { - renderer.subPixelFix = subPixelFix = function () { - css(container, { left: 0, top: 0 }); - rect = container.getBoundingClientRect(); - css(container, { - left: (mathCeil(rect.left) - rect.left) + PX, - top: (mathCeil(rect.top) - rect.top) + PX - }); - }; - - // run the fix now - subPixelFix(); - - // run it on resize - addEvent(win, 'resize', subPixelFix); - } - }, - - /** - * Detect whether the renderer is hidden. This happens when one of the parent elements - * has display: none. #608. - */ - isHidden: function () { - return !this.boxWrapper.getBBox().width; - }, - - /** - * Destroys the renderer and its allocated members. - */ - destroy: function () { - var renderer = this, - rendererDefs = renderer.defs; - renderer.box = null; - renderer.boxWrapper = renderer.boxWrapper.destroy(); - - // Call destroy on all gradient elements - destroyObjectProperties(renderer.gradients || {}); - renderer.gradients = null; - - // Defs are null in VMLRenderer - // Otherwise, destroy them here. - if (rendererDefs) { - renderer.defs = rendererDefs.destroy(); - } - - // Remove sub pixel fix handler - // We need to check that there is a handler, otherwise all functions that are registered for event 'resize' are removed - // See issue #982 - if (renderer.subPixelFix) { - removeEvent(win, 'resize', renderer.subPixelFix); - } - - renderer.alignedObjects = null; - - return null; - }, - - /** - * Create a wrapper for an SVG element - * @param {Object} nodeName - */ - createElement: function (nodeName) { - var wrapper = new this.Element(); - wrapper.init(this, nodeName); - return wrapper; - }, - - /** - * Dummy function for use in canvas renderer - */ - draw: function () {}, - - /** - * Parse a simple HTML string into SVG tspans - * - * @param {Object} textNode The parent text SVG node - */ - buildText: function (wrapper) { - var textNode = wrapper.element, - lines = pick(wrapper.textStr, '').toString() - .replace(/<(b|strong)>/g, '') - .replace(/<(i|em)>/g, '') - .replace(//g, '') - .split(/
', - pointFormat: 'x: {point.x}
y: {point.y}
' - } -}); - -/** - * The scatter series class - */ -var ScatterSeries = extendClass(Series, { - type: 'scatter', - sorted: false, - /** - * Extend the base Series' translate method by adding shape type and - * arguments for the point trackers - */ - translate: function () { - var series = this; - - Series.prototype.translate.apply(series); - - each(series.points, function (point) { - point.shapeType = 'circle'; - point.shapeArgs = { - x: point.plotX, - y: point.plotY, - r: series.chart.options.tooltip.snap - }; - }); - }, - - /** - * Add tracking event listener to the series group, so the point graphics - * themselves act as trackers - */ - drawTracker: function () { - var series = this, - cursor = series.options.cursor, - css = cursor && { cursor: cursor }, - points = series.points, - i = points.length, - graphic; - - // Set an expando property for the point index, used below - while (i--) { - graphic = points[i].graphic; - if (graphic) { // doesn't exist for null points - graphic.element._i = i; - } - } - - // Add the event listeners, we need to do this only once - if (!series._hasTracking) { - series.group - .attr({ - isTracker: true - }) - .on(hasTouch ? 'touchstart' : 'mouseover', function (e) { - series.onMouseOver(); - if (e.target._i !== UNDEFINED) { // undefined on graph in scatterchart - points[e.target._i].onMouseOver(); - } - }) - .on('mouseout', function () { - if (!series.options.stickyTracking) { - series.onMouseOut(); - } - }) - .css(css); - } else { - series._hasTracking = true; - } - - } -}); -seriesTypes.scatter = ScatterSeries; - -/** - * Set the default options for pie - */ -defaultPlotOptions.pie = merge(defaultSeriesOptions, { - borderColor: '#FFFFFF', - borderWidth: 1, - center: ['50%', '50%'], - colorByPoint: true, // always true for pies - dataLabels: { - // align: null, - // connectorWidth: 1, - // connectorColor: point.color, - // connectorPadding: 5, - distance: 30, - enabled: true, - formatter: function () { - return this.point.name; - }, - // softConnector: true, - y: 5 - }, - //innerSize: 0, - legendType: 'point', - marker: null, // point options are specified in the base options - size: '75%', - showInLegend: false, - slicedOffset: 10, - states: { - hover: { - brightness: 0.1, - shadow: false - } - } -}); - -/** - * Extended point object for pies - */ -var PiePoint = extendClass(Point, { - /** - * Initiate the pie slice - */ - init: function () { - - Point.prototype.init.apply(this, arguments); - - var point = this, - toggleSlice; - - //visible: options.visible !== false, - extend(point, { - visible: point.visible !== false, - name: pick(point.name, 'Slice') - }); - - // add event listener for select - toggleSlice = function () { - point.slice(); - }; - addEvent(point, 'select', toggleSlice); - addEvent(point, 'unselect', toggleSlice); - - return point; - }, - - /** - * Toggle the visibility of the pie slice - * @param {Boolean} vis Whether to show the slice or not. If undefined, the - * visibility is toggled - */ - setVisible: function (vis) { - var point = this, - chart = point.series.chart, - tracker = point.tracker, - dataLabel = point.dataLabel, - connector = point.connector, - shadowGroup = point.shadowGroup, - method; - - // if called without an argument, toggle visibility - point.visible = vis = vis === UNDEFINED ? !point.visible : vis; - - method = vis ? 'show' : 'hide'; - - point.group[method](); - if (tracker) { - tracker[method](); - } - if (dataLabel) { - dataLabel[method](); - } - if (connector) { - connector[method](); - } - if (shadowGroup) { - shadowGroup[method](); - } - if (point.legendItem) { - chart.legend.colorizeItem(point, vis); - } - }, - - /** - * Set or toggle whether the slice is cut out from the pie - * @param {Boolean} sliced When undefined, the slice state is toggled - * @param {Boolean} redraw Whether to redraw the chart. True by default. - */ - slice: function (sliced, redraw, animation) { - var point = this, - series = point.series, - chart = series.chart, - slicedTranslation = point.slicedTranslation, - translation; - - setAnimation(animation, chart); - - // redraw is true by default - redraw = pick(redraw, true); - - // if called without an argument, toggle - sliced = point.sliced = defined(sliced) ? sliced : !point.sliced; - - translation = { - translateX: (sliced ? slicedTranslation[0] : chart.plotLeft), - translateY: (sliced ? slicedTranslation[1] : chart.plotTop) - }; - point.group.animate(translation); - if (point.shadowGroup) { - point.shadowGroup.animate(translation); - } - - } -}); - -/** - * The Pie series class - */ -var PieSeries = { - type: 'pie', - isCartesian: false, - pointClass: PiePoint, - pointAttrToOptions: { // mapping between SVG attributes and the corresponding options - stroke: 'borderColor', - 'stroke-width': 'borderWidth', - fill: 'color' - }, - - /** - * Pies have one color each point - */ - getColor: function () { - // record first color for use in setData - this.initialColor = this.chart.counters.color; - }, - - /** - * Animate the pies in - */ - animate: function () { - var series = this, - points = series.points; - - each(points, function (point) { - var graphic = point.graphic, - args = point.shapeArgs, - up = -mathPI / 2; - - if (graphic) { - // start values - graphic.attr({ - r: 0, - start: up, - end: up - }); - - // animate - graphic.animate({ - r: args.r, - start: args.start, - end: args.end - }, series.options.animation); - } - }); - - // delete this function to allow it only once - series.animate = null; - - }, - - /** - * Extend the basic setData method by running processData and generatePoints immediately, - * in order to access the points from the legend. - */ - setData: function (data, redraw) { - Series.prototype.setData.call(this, data, false); - this.processData(); - this.generatePoints(); - if (pick(redraw, true)) { - this.chart.redraw(); - } - }, - - /** - * Get the center of the pie based on the size and center options relative to the - * plot area. Borrowed by the polar and gauge series types. - */ - getCenter: function () { - - var options = this.options, - chart = this.chart, - plotWidth = chart.plotWidth, - plotHeight = chart.plotHeight, - positions = options.center.concat([options.size, options.innerSize || 0]), - smallestSize = mathMin(plotWidth, plotHeight), - isPercent; - - return map(positions, function (length, i) { - - isPercent = /%$/.test(length); - return isPercent ? - // i == 0: centerX, relative to width - // i == 1: centerY, relative to height - // i == 2: size, relative to smallestSize - // i == 4: innerSize, relative to smallestSize - [plotWidth, plotHeight, smallestSize, smallestSize][i] * - pInt(length) / 100 : - length; - }); - }, - - /** - * Do translation for pie slices - */ - translate: function () { - this.generatePoints(); - - var total = 0, - series = this, - cumulative = -0.25, // start at top - precision = 1000, // issue #172 - options = series.options, - slicedOffset = options.slicedOffset, - connectorOffset = slicedOffset + options.borderWidth, - positions, - chart = series.chart, - start, - end, - angle, - points = series.points, - circ = 2 * mathPI, - fraction, - radiusX, // the x component of the radius vector for a given point - radiusY, - labelDistance = options.dataLabels.distance; - - // get positions - either an integer or a percentage string must be given - series.center = positions = series.getCenter(); - - // utility for getting the x value from a given y, used for anticollision logic in data labels - series.getX = function (y, left) { - - angle = math.asin((y - positions[1]) / (positions[2] / 2 + labelDistance)); - - return positions[0] + - (left ? -1 : 1) * - (mathCos(angle) * (positions[2] / 2 + labelDistance)); - }; - - // get the total sum - each(points, function (point) { - total += point.y; - }); - - each(points, function (point) { - // set start and end angle - fraction = total ? point.y / total : 0; - start = mathRound(cumulative * circ * precision) / precision; - cumulative += fraction; - end = mathRound(cumulative * circ * precision) / precision; - - // set the shape - point.shapeType = 'arc'; - point.shapeArgs = { - x: positions[0], - y: positions[1], - r: positions[2] / 2, - innerR: positions[3] / 2, - start: start, - end: end - }; - - // center for the sliced out slice - angle = (end + start) / 2; - point.slicedTranslation = map([ - mathCos(angle) * slicedOffset + chart.plotLeft, - mathSin(angle) * slicedOffset + chart.plotTop - ], mathRound); - - // set the anchor point for tooltips - radiusX = mathCos(angle) * positions[2] / 2; - radiusY = mathSin(angle) * positions[2] / 2; - point.tooltipPos = [ - positions[0] + radiusX * 0.7, - positions[1] + radiusY * 0.7 - ]; - - // set the anchor point for data labels - point.labelPos = [ - positions[0] + radiusX + mathCos(angle) * labelDistance, // first break of connector - positions[1] + radiusY + mathSin(angle) * labelDistance, // a/a - positions[0] + radiusX + mathCos(angle) * connectorOffset, // second break, right outside pie - positions[1] + radiusY + mathSin(angle) * connectorOffset, // a/a - positions[0] + radiusX, // landing point for connector - positions[1] + radiusY, // a/a - labelDistance < 0 ? // alignment - 'center' : - angle < circ / 4 ? 'left' : 'right', // alignment - angle // center angle - ]; - - // API properties - point.percentage = fraction * 100; - point.total = total; - - }); - - - this.setTooltipPoints(); - }, - - /** - * Render the slices - */ - render: function () { - var series = this; - - // cache attributes for shapes - series.getAttribs(); - - this.drawPoints(); - - // draw the mouse tracking area - if (series.options.enableMouseTracking !== false) { - series.drawTracker(); - } - - this.drawDataLabels(); - - if (series.options.animation && series.animate) { - series.animate(); - } - - // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see - series.isDirty = false; // means data is in accordance with what you see - }, - - /** - * Draw the data points - */ - drawPoints: function () { - var series = this, - chart = series.chart, - renderer = chart.renderer, - groupTranslation, - //center, - graphic, - group, - shadow = series.options.shadow, - shadowGroup, - shapeArgs; - - // draw the slices - each(series.points, function (point) { - graphic = point.graphic; - shapeArgs = point.shapeArgs; - group = point.group; - shadowGroup = point.shadowGroup; - - // put the shadow behind all points - if (shadow && !shadowGroup) { - shadowGroup = point.shadowGroup = renderer.g('shadow') - .attr({ zIndex: 4 }) - .add(); - } - - // create the group the first time - if (!group) { - group = point.group = renderer.g('point') - .attr({ zIndex: 5 }) - .add(); - } - - // if the point is sliced, use special translation, else use plot area traslation - groupTranslation = point.sliced ? point.slicedTranslation : [chart.plotLeft, chart.plotTop]; - group.translate(groupTranslation[0], groupTranslation[1]); - if (shadowGroup) { - shadowGroup.translate(groupTranslation[0], groupTranslation[1]); - } - - // draw the slice - if (graphic) { - graphic.animate(shapeArgs); - } else { - point.graphic = graphic = renderer.arc(shapeArgs) - .setRadialReference(series.center) - .attr(extend( - point.pointAttr[NORMAL_STATE], - { 'stroke-linejoin': 'round' } - )) - .add(point.group) - .shadow(shadow, shadowGroup); - - } - - // detect point specific visibility - if (point.visible === false) { - point.setVisible(false); - } - - }); - - }, - - /** - * Override the base drawDataLabels method by pie specific functionality - */ - drawDataLabels: function () { - var series = this, - data = series.data, - point, - chart = series.chart, - options = series.options.dataLabels, - connectorPadding = pick(options.connectorPadding, 10), - connectorWidth = pick(options.connectorWidth, 1), - connector, - connectorPath, - softConnector = pick(options.softConnector, true), - distanceOption = options.distance, - seriesCenter = series.center, - radius = seriesCenter[2] / 2, - centerY = seriesCenter[1], - outside = distanceOption > 0, - dataLabel, - labelPos, - labelHeight, - halves = [// divide the points into right and left halves for anti collision - [], // right - [] // left - ], - x, - y, - visibility, - rankArr, - sort, - i = 2, - j; - - // get out if not enabled - if (!options.enabled) { - return; - } - - // run parent method - Series.prototype.drawDataLabels.apply(series); - - // arrange points for detection collision - each(data, function (point) { - if (point.dataLabel) { // it may have been cancelled in the base method (#407) - halves[ - point.labelPos[7] < mathPI / 2 ? 0 : 1 - ].push(point); - } - }); - halves[1].reverse(); - - // define the sorting algorithm - sort = function (a, b) { - return b.y - a.y; - }; - - // assume equal label heights - labelHeight = halves[0][0] && halves[0][0].dataLabel && (halves[0][0].dataLabel.getBBox().height || 21); // 21 is for #968 - - /* Loop over the points in each half, starting from the top and bottom - * of the pie to detect overlapping labels. - */ - while (i--) { - - var slots = [], - slotsLength, - usedSlots = [], - points = halves[i], - pos, - length = points.length, - slotIndex; - - // Only do anti-collision when we are outside the pie and have connectors (#856) - if (distanceOption > 0) { - - // build the slots - for (pos = centerY - radius - distanceOption; pos <= centerY + radius + distanceOption; pos += labelHeight) { - slots.push(pos); - // visualize the slot - /* - var slotX = series.getX(pos, i) + chart.plotLeft - (i ? 100 : 0), - slotY = pos + chart.plotTop; - if (!isNaN(slotX)) { - chart.renderer.rect(slotX, slotY - 7, 100, labelHeight) - .attr({ - 'stroke-width': 1, - stroke: 'silver' - }) - .add(); - chart.renderer.text('Slot '+ (slots.length - 1), slotX, slotY + 4) - .attr({ - fill: 'silver' - }).add(); - } - // */ - } - slotsLength = slots.length; - - // if there are more values than available slots, remove lowest values - if (length > slotsLength) { - // create an array for sorting and ranking the points within each quarter - rankArr = [].concat(points); - rankArr.sort(sort); - j = length; - while (j--) { - rankArr[j].rank = j; - } - j = length; - while (j--) { - if (points[j].rank >= slotsLength) { - points.splice(j, 1); - } - } - length = points.length; - } - - // The label goes to the nearest open slot, but not closer to the edge than - // the label's index. - for (j = 0; j < length; j++) { - - point = points[j]; - labelPos = point.labelPos; - - var closest = 9999, - distance, - slotI; - - // find the closest slot index - for (slotI = 0; slotI < slotsLength; slotI++) { - distance = mathAbs(slots[slotI] - labelPos[1]); - if (distance < closest) { - closest = distance; - slotIndex = slotI; - } - } - - // if that slot index is closer to the edges of the slots, move it - // to the closest appropriate slot - if (slotIndex < j && slots[j] !== null) { // cluster at the top - slotIndex = j; - } else if (slotsLength < length - j + slotIndex && slots[j] !== null) { // cluster at the bottom - slotIndex = slotsLength - length + j; - while (slots[slotIndex] === null) { // make sure it is not taken - slotIndex++; - } - } else { - // Slot is taken, find next free slot below. In the next run, the next slice will find the - // slot above these, because it is the closest one - while (slots[slotIndex] === null) { // make sure it is not taken - slotIndex++; - } - } - - usedSlots.push({ i: slotIndex, y: slots[slotIndex] }); - slots[slotIndex] = null; // mark as taken - } - // sort them in order to fill in from the top - usedSlots.sort(sort); - } - - // now the used slots are sorted, fill them up sequentially - for (j = 0; j < length; j++) { - - var slot, naturalY; - - point = points[j]; - labelPos = point.labelPos; - dataLabel = point.dataLabel; - visibility = point.visible === false ? HIDDEN : VISIBLE; - naturalY = labelPos[1]; - - if (distanceOption > 0) { - slot = usedSlots.pop(); - slotIndex = slot.i; - - // if the slot next to currrent slot is free, the y value is allowed - // to fall back to the natural position - y = slot.y; - if ((naturalY > y && slots[slotIndex + 1] !== null) || - (naturalY < y && slots[slotIndex - 1] !== null)) { - y = naturalY; - } - - } else { - y = naturalY; - } - - // get the x - use the natural x position for first and last slot, to prevent the top - // and botton slice connectors from touching each other on either side - x = options.justify ? - seriesCenter[0] + (i ? -1 : 1) * (radius + distanceOption) : - series.getX(slotIndex === 0 || slotIndex === slots.length - 1 ? naturalY : y, i); - - // move or place the data label - dataLabel - .attr({ - visibility: visibility, - align: labelPos[6] - })[dataLabel.moved ? 'animate' : 'attr']({ - x: x + options.x + - ({ left: connectorPadding, right: -connectorPadding }[labelPos[6]] || 0), - y: y + options.y - }); - dataLabel.moved = true; - - // draw the connector - if (outside && connectorWidth) { - connector = point.connector; - - connectorPath = softConnector ? [ - M, - x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label - 'C', - x, y, // first break, next to the label - 2 * labelPos[2] - labelPos[4], 2 * labelPos[3] - labelPos[5], - labelPos[2], labelPos[3], // second break - L, - labelPos[4], labelPos[5] // base - ] : [ - M, - x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label - L, - labelPos[2], labelPos[3], // second break - L, - labelPos[4], labelPos[5] // base - ]; - - if (connector) { - connector.animate({ d: connectorPath }); - connector.attr('visibility', visibility); - - } else { - point.connector = connector = series.chart.renderer.path(connectorPath).attr({ - 'stroke-width': connectorWidth, - stroke: options.connectorColor || point.color || '#606060', - visibility: visibility, - zIndex: 3 - }) - .translate(chart.plotLeft, chart.plotTop) - .add(); - } - } - } - } - }, - - /** - * Draw point specific tracker objects. Inherit directly from column series. - */ - drawTracker: ColumnSeries.prototype.drawTracker, - - /** - * Use a simple symbol from column prototype - */ - drawLegendSymbol: AreaSeries.prototype.drawLegendSymbol, - - /** - * Pies don't have point marker symbols - */ - getSymbol: function () {} - -}; -PieSeries = extendClass(Series, PieSeries); -seriesTypes.pie = PieSeries; - - -// global variables -extend(Highcharts, { - - // Constructors - Axis: Axis, - CanVGRenderer: CanVGRenderer, - Chart: Chart, - Color: Color, - Legend: Legend, - Point: Point, - Tick: Tick, - Tooltip: Tooltip, - Renderer: Renderer, - Series: Series, - SVGRenderer: SVGRenderer, - VMLRenderer: VMLRenderer, - - // Various - dateFormat: dateFormat, - pathAnim: pathAnim, - getOptions: getOptions, - hasBidiBug: hasBidiBug, - numberFormat: numberFormat, - seriesTypes: seriesTypes, - setOptions: setOptions, - addEvent: addEvent, - removeEvent: removeEvent, - createElement: createElement, - discardElement: discardElement, - css: css, - each: each, - extend: extend, - map: map, - merge: merge, - pick: pick, - splat: splat, - extendClass: extendClass, - pInt: pInt, - product: 'Highcharts', - version: '2.2.5' -}); -}()); diff --git a/WebContent/plug-in/Highcharts-2.2.5/js/modules/canvas-tools.js b/WebContent/plug-in/Highcharts-2.2.5/js/modules/canvas-tools.js deleted file mode 100644 index 49e51889..00000000 --- a/WebContent/plug-in/Highcharts-2.2.5/js/modules/canvas-tools.js +++ /dev/null @@ -1,133 +0,0 @@ -/* - A class to parse color values - @author Stoyan Stefanov
' + svg + ''; - } - } // */ - ] - - }, - printButton: { - //enabled: true, - symbol: 'printIcon', - x: -36, - symbolFill: '#B5C9DF', - hoverSymbolFill: '#779ABF', - _id: 'printButton', - _titleKey: 'printButtonTitle', - onclick: function () { - this.print(); - } - } - } -}; - - - -extend(Chart.prototype, { - /** - * Return an SVG representation of the chart - * - * @param additionalOptions {Object} Additional chart options for the generated SVG representation - */ - getSVG: function (additionalOptions) { - var chart = this, - chartCopy, - sandbox, - svg, - seriesOptions, - options = merge(chart.options, additionalOptions); // copy the options and add extra options - - // IE compatibility hack for generating SVG content that it doesn't really understand - if (!doc.createElementNS) { - /*jslint unparam: true*//* allow unused parameter ns in function below */ - doc.createElementNS = function (ns, tagName) { - return doc.createElement(tagName); - }; - /*jslint unparam: false*/ - } - - // create a sandbox where a new chart will be generated - sandbox = createElement(DIV, null, { - position: ABSOLUTE, - top: '-9999em', - width: chart.chartWidth + PX, - height: chart.chartHeight + PX - }, doc.body); - - // override some options - extend(options.chart, { - renderTo: sandbox, - forExport: true - }); - options.exporting.enabled = false; // hide buttons in print - options.chart.plotBackgroundImage = null; // the converter doesn't handle images - - // prepare for replicating the chart - options.series = []; - each(chart.series, function (serie) { - seriesOptions = merge(serie.options, { - animation: false, // turn off animation - showCheckbox: false, - visible: serie.visible - }); - - if (!seriesOptions.isInternal) { // used for the navigator series that has its own option set - - // remove image markers - if (seriesOptions && seriesOptions.marker && /^url\(/.test(seriesOptions.marker.symbol)) { - seriesOptions.marker.symbol = 'circle'; - } - - options.series.push(seriesOptions); - } - }); - - // generate the chart copy - chartCopy = new Highcharts.Chart(options); - - // reflect axis extremes in the export - each(['xAxis', 'yAxis'], function (axisType) { - each(chart[axisType], function (axis, i) { - var axisCopy = chartCopy[axisType][i], - extremes = axis.getExtremes(), - userMin = extremes.userMin, - userMax = extremes.userMax; - - if (userMin !== UNDEFINED || userMax !== UNDEFINED) { - axisCopy.setExtremes(userMin, userMax, true, false); - } - }); - }); - - // get the SVG from the container's innerHTML - svg = chartCopy.container.innerHTML; - - // free up memory - options = null; - chartCopy.destroy(); - discardElement(sandbox); - - // sanitize - svg = svg - .replace(/zIndex="[^"]+"/g, '') - .replace(/isShadow="[^"]+"/g, '') - .replace(/symbolName="[^"]+"/g, '') - .replace(/jQuery[0-9]+="[^"]+"/g, '') - .replace(/isTracker="[^"]+"/g, '') - .replace(/url\([^#]+#/g, 'url(#') - .replace(/') // any HTML added to the container after the SVG (#894) - /* This fails in IE < 8 - .replace(/([0-9]+)\.([0-9]+)/g, function(s1, s2, s3) { // round off to save weight - return s2 +'.'+ s3[0]; - })*/ - - // Replace HTML entities, issue #347 - .replace(/ /g, '\u00A0') // no-break space - .replace(//g, '\u00AD') // soft hyphen - - // IE specific - .replace(/