Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

decouple Flashchart component from zul.jar to flashchart.jar and move…

… its source to Github - https://github.com/zkoss/flashchart
  • Loading branch information...
commit e5a729e9ba82684cb74e40e6575e28696fcc63ad 1 parent 2b76f1f
@jumperchen jumperchen authored
View
BIN  dist/lib/flashchart.jar
Binary file not shown
View
6 zkdoc/release-note
@@ -44,8 +44,12 @@ ZK 6.5.1
ZK-1430: Listbox in Bandpopup of a Bandbox is not size correctly - "rows" is ignored.
ZK-1370: org.zkoss.zul.Datebox.setDisplayedTimeZones(List dtzones) NPE if emptied
ZK-1437: javascript error when use include with auto mode
-
+
* Upgrade Notes
+ + Decouple Flashchart component from zul.jar to flashchart.jar, due to Flashchart contains a potential
+ SWF vulnerability in YUI 2 that the SWF files in question contain a cross-site JavaScript injection
+ vulnerability which allows for the execution of arbitrary third-party code within the domain from which
+ the files are served. Please download the flashchart.jar from the link instead - https://github.com/zkoss/flashchart
--------
ZK 6.5.0
View
5 zksandbox/pom.xml
@@ -241,6 +241,11 @@
<version>${zkel.version}</version>
</dependency>
<dependency>
+ <groupId>org.zkoss.addon</groupId>
+ <artifactId>flashchart</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
View
1  zksandbox/war.libs.all
@@ -30,3 +30,4 @@ jxl.jar
poi.jar
sapphire.jar
silvertail.jar
+flashchart.jar
View
5 zktest/pom.xml
@@ -160,6 +160,11 @@
<version>${zkel.version}</version>
</dependency>
<dependency>
+ <groupId>org.zkoss.addon</groupId>
+ <artifactId>flashchart</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
View
1  zktest/war.libs.all
@@ -32,3 +32,4 @@ groovy.jar
jruby.jar
js.jar
jython.jar
+flashchart.jar
View
9 zul/src/archive/metainfo/zk/lang.xml
@@ -579,15 +579,6 @@ def alert(m):
</mold>
</component>
<component>
- <component-name>flashchart</component-name>
- <component-class>org.zkoss.zul.Flashchart</component-class>
- <widget-class>zul.fchart.Flashchart</widget-class>
- <mold>
- <mold-name>default</mold-name>
- <mold-uri>mold/flashchart.js</mold-uri>
- </mold>
- </component>
- <component>
<component-name>foot</component-name>
<component-class>org.zkoss.zul.Foot</component-class>
<widget-class>zul.grid.Foot</widget-class>
View
259 zul/src/archive/web/js/zul/fchart/Flashchart.js
@@ -1,259 +0,0 @@
-/* Flashchart.js
-
- Purpose:
-
- Description:
- charts.swf version is 2.7.0 for YUI 2.8.2 version.
- History:
- Nov 26, 2009 11:58:42 AM , Created by joy
-
-Copyright (C) 2009 Potix Corporation. All Rights Reserved.
-
-This program is distributed under LGPL Version 2.1 in the hope that
-it will be useful, but WITHOUT ANY WARRANTY.
-
-*/
-(function () {
- var _src = zk.ajaxURI('/web/js/zul/fchart/charts.swf', {au: true}),
- _expressInstall = zk.ajaxURI('/web/js/zul/fchart/expressinstall.swf', {au: true}),
- _axis = {
- stackingEnabled: true,
- type: "numeric",
- alwaysShowZero: true,
- hideOverlappinLabels: true,
- reverse: false,
- scale: "linear",
- snapToUnits: true
- };
-
- function JSONEncode(x) {
- switch (typeof x) {
- case "number":
- return String(x);
- case "boolean":
- return String(x);
- case "string":
- return '"' + x + '"';
- default:
- return "null";
- }
- }
-
- /* A method use to format String to JSON
- * example:
- * 'legend-display=right,legend-padding=10' will be transfer to '{"legend":{"display":"right","padding":"10"}}'
- */
- function formatToJSON(str) {
- var list = str.split(','),
- len = list.length,
- categorys = [],
- result = ['{'],
- cl;
-
- for (var j = 0; j < len; j++) {
- var temp = list[j].split('-'),
- category = !temp[2] ? temp[0] : temp[1],
- alreadyHaveCategory = false,
- attr, val;
- if (!temp[1]) {
- result.push("}");
- break;
- }
- if (!temp[2]) {
- attr = temp[1].split('=')[0],
- val = temp[1].split('=')[1];
- } else {
- attr = temp[2].split('=')[0],
- val = temp[2].split('=')[1];
- }
- cl = categorys.length;
- if (cl > 0) {
- for (var i = 0; i < cl; i++) {
- if (categorys[i].match(category)) {
- alreadyHaveCategory = true;
- break;
- }
- }
- }
- if (!alreadyHaveCategory) {
- categorys.push(JSONEncode(category));
- if (!temp[2]) {
- result.push(JSONEncode(category), ":");
- } else {
- result.push(",", JSONEncode(category), ":");
- }
- result.push("{", JSONEncode(attr), ":", JSONEncode(val));
- } else {
- result.push(",", JSONEncode(attr), ":", JSONEncode(val));
- }
- }
- cl = categorys.length;
- for (var j = 0; j < cl; j++) {
- result.push('}');
- }
- result.push('}');
- return result.join("");
- }
-
- /* If e.type == swfReady, then init chart data. */
- function onFlashEvent(wgt, event) {
- var swf = wgt.$n('chart'),
- type = wgt._type,
- chartStyle = wgt._chartStyle,
- data = jq.evalJSON(wgt._jsonModel),
- series = (type == 'pie') ? false : jq.evalJSON(wgt._jsonSeries),
- dataProvider = seriesProvider(series, type, data);
-
- swf.setType(type);
- swf.setStyles(formatToJSON(chartStyle || wgt._defaultStyle));
-
- if (type == "pie") {
- swf.setCategoryField("categoryField");
- swf.setDataField("dataField");
-
- } else if (type == "bar" || type == "stackbar") {
- swf.setHorizontalAxis(_axis);
- swf.setVerticalField("values");
-
- } else {
- swf.setVerticalAxis(_axis);
- swf.setHorizontalField("values");
-
- }
- swf.setDataProvider(dataProvider);
- }
-
- /* Refresh the data of chart */
- function refresh(wgt, dataModel) {
- var type = wgt._type,
- data = jq.evalJSON(dataModel),
- series = (type == 'pie') ? false : jq.evalJSON(wgt._jsonSeries),
- dataProvider = seriesProvider(series, type, data);
- wgt.$n('chart').setDataProvider(dataProvider);
- }
-
- function seriesProvider(series, type, data) {
- if (!series)
- return [{type: type, dataProvider: data}];
-
- var dataProvider = [];
- for (var i = 0, len = series.length; i < len; i++) {
- var current = series[i],
- clone = {};
- for (var key in current) {
- if (key == "style" && current.style !== null)
- clone.style = formatToJSON(current.style);
- else
- clone[key] = current[key];
- }
- if (!clone.type)
- clone.type = type;
- clone.dataProvider = data;
- dataProvider.push(clone);
- }
- return dataProvider;
- }
-
-var Flashchart =
-/**
- * The generic flash chart component. Developers set proper chart type, data model,
- * and the src attribute to draw proper chart. The model and type must match to each other;
- * or the result is unpredictable.
- *
- * <table>
- * <tr><th>type</th></tr>
- * <tr><td>pie</td></tr>
- * <tr><td>bar</td></tr>
- * <tr><td>line</td></tr>
- * <tr><td>column</td></tr>
- * <tr><td>stackbar</td></tr>
- * <tr><td>stackcolumn</td></tr>
- * </table>
- *
- * <p>Default {@link #getWidth}: 400px
- * <p>Default {@link #getHeight}: 200px
- *
- */
-zul.fchart.Flashchart = zk.$extends(zul.med.Flash, {
-
- /* Default values */
- _width: "400px",
- _height: "200px",
- _defaultStyle: "legend-display=right,legend-padding=10,legend-spacing=5,legend-font-family=Arial,legend-font-size=13",
-
- $define: {
- /** Sets the content style of flashchart.
- * <p>Default format: "Category-Attribute=Value", ex."legend-display=right"
- * @param String chartStyle
- */
- /** Returns the content style.
- * @return String
- */
- chartStyle: null,
- /** Sets a concatenation of a list of model of chart,
- * separated by comma.
- * <p>Only implement models which matched the allowed types
- * @param String jsonModel
- */
- /** Returns a concatenation of a list of the model's attribute of chart,
- * separated by comma.
- * @return String
- */
- jsonModel: null,
- /** Sets a concatenation of a list of the model's series of chart,
- * separated by comma.
- * <p>Only implement models which matched the allowed types
- * @param String jsonModel
- */
- /** Returns a concatenation of a list of the model's series of chart,
- * separated by comma.
- * @return String
- */
- jsonSeries: null,
- /** Sets the type of chart.
- * <p>Default: "pie"
- * <p>Allowed Types: pie, line, bar, column, stackbar, stackcolumn
- * @param String type
- */
- /** Returns the type of chart
- * @return String
- */
- type: null
- },
- setRefresh: function (mod) {
- refresh(this, mod);
- },
- bind_: function (desktop, skipper, after) {
- this.$supers(Flashchart, 'bind_', arguments);
- var _swfId = this.uuid + "-chart",
- _flashvars = "allowedDomain=localhost&elementID=" + _swfId +
- "&eventHandler=zul.fchart.Flashchart.onEvent",
- _params = {
- flashvars: _flashvars,
- allowScriptAccess: "always",
- bgcolor: "#ffffff",
- wmode: "opaque"
- },
- _attributes = {id: _swfId, classid: "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"};
-
- var src = _src;
- if (zk.ie || zk.opera) // Add a cache buster at the end of src url for IE and Opera
- src += (src.indexOf('?') === -1 ? '?' : '&') + "_cache=" + new Date().getTime();
- zul.fchart.swfobject.embedSWF(src, _swfId, this._width, this._height,
- "9.0.0", _expressInstall, false, _params, _attributes);
-
- }
-
-}, { // static
-
- onEvent: function (id, event) {
- var eventType = event.type;
- if (eventType == "swfReady") {
- var comp = zk.Widget.$(id);
- if (comp)
- onFlashEvent(comp, event);
- }
- }
-
-});
-})();
View
BIN  zul/src/archive/web/js/zul/fchart/charts.swf
Binary file not shown
View
BIN  zul/src/archive/web/js/zul/fchart/expressinstall.swf
Binary file not shown
View
18 zul/src/archive/web/js/zul/fchart/mold/flashchart.js
@@ -1,18 +0,0 @@
-/* flashchart.js
-
- Purpose:
-
- Description:
-
- History:
- Nov 26, 2009 11:58:49 AM , Created by joy
-
-Copyright (C) 2009 Potix Corporation. All Rights Reserved.
-
-This program is distributed under LGPL Version 2.1 in the hope that
-it will be useful, but WITHOUT ANY WARRANTY.
-
-*/
-function (out) {
- out.push('<div', this.domAttrs_(), '><object id="', this.uuid, '-chart"></object></div>');
-}
View
777 zul/src/archive/web/js/zul/fchart/swfobject.js
@@ -1,777 +0,0 @@
-/*! SWFObject v2.2 <http://code.google.com/p/swfobject/>
- is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
-
-zul.fchart.swfobject = function() {
-
- var UNDEF = "undefined",
- OBJECT = "object",
- SHOCKWAVE_FLASH = "Shockwave Flash",
- SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
- FLASH_MIME_TYPE = "application/x-shockwave-flash",
- EXPRESS_INSTALL_ID = "SWFObjectExprInst",
- ON_READY_STATE_CHANGE = "onreadystatechange",
-
- win = window,
- doc = document,
- nav = navigator,
-
- plugin = false,
- domLoadFnArr = [main],
- regObjArr = [],
- objIdArr = [],
- listenersArr = [],
- storedAltContent,
- storedAltContentId,
- storedCallbackFn,
- storedCallbackObj,
- isDomLoaded = false,
- isExpressInstallActive = false,
- dynamicStylesheet,
- dynamicStylesheetMedia,
- autoHideShow = true,
-
- /* Centralized function for browser feature detection
- - User agent string detection is only used when no good alternative is possible
- - Is executed directly for optimal performance
- */
- ua = function() {
- var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF,
- u = nav.userAgent.toLowerCase(),
- p = nav.platform.toLowerCase(),
- windows = p ? /win/.test(p) : /win/.test(u),
- mac = p ? /mac/.test(p) : /mac/.test(u),
- webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
- ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
- playerVersion = [0,0,0],
- d = null;
- if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) {
- d = nav.plugins[SHOCKWAVE_FLASH].description;
- if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+
- plugin = true;
- ie = false; // cascaded feature detection for Internet Explorer
- d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1");
- playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10);
- playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10);
- playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0;
- }
- }
- else if (typeof win.ActiveXObject != UNDEF) {
- try {
- var a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
- if (a) { // a will return null when ActiveX is disabled
- d = a.GetVariable("$version");
- if (d) {
- ie = true; // cascaded feature detection for Internet Explorer
- d = d.split(" ")[1].split(",");
- playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
- }
- }
- }
- catch(e) {}
- }
- return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac };
- }(),
-
- /* Cross-browser onDomLoad
- - Will fire an event as soon as the DOM of a web page is loaded
- - Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/
- - Regular onload serves as fallback
- */
- onDomLoad = function() {
- if (!ua.w3) { return; }
- if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically
- callDomLoadFunctions();
- }
- if (!isDomLoaded) {
- if (typeof doc.addEventListener != UNDEF) {
- doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false);
- }
- if (ua.ie && ua.win) {
- doc.attachEvent(ON_READY_STATE_CHANGE, function() {
- if (doc.readyState == "complete") {
- doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee);
- callDomLoadFunctions();
- }
- });
- if (win == top) { // if not inside an iframe
- (function(){
- if (isDomLoaded) { return; }
- try {
- doc.documentElement.doScroll("left");
- }
- catch(e) {
- setTimeout(arguments.callee, 0);
- return;
- }
- callDomLoadFunctions();
- })();
- }
- }
- if (ua.wk) {
- (function(){
- if (isDomLoaded) { return; }
- if (!/loaded|complete/.test(doc.readyState)) {
- setTimeout(arguments.callee, 0);
- return;
- }
- callDomLoadFunctions();
- })();
- }
- addLoadEvent(callDomLoadFunctions);
- }
- }();
-
- function callDomLoadFunctions() {
- if (isDomLoaded) { return; }
- try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early
- var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span"));
- t.parentNode.removeChild(t);
- }
- catch (e) { return; }
- isDomLoaded = true;
- var dl = domLoadFnArr.length;
- for (var i = 0; i < dl; i++) {
- domLoadFnArr[i]();
- }
- }
-
- function addDomLoadEvent(fn) {
- if (isDomLoaded) {
- fn();
- }
- else {
- domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+
- }
- }
-
- /* Cross-browser onload
- - Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/
- - Will fire an event as soon as a web page including all of its assets are loaded
- */
- function addLoadEvent(fn) {
- if (typeof win.addEventListener != UNDEF) {
- win.addEventListener("load", fn, false);
- }
- else if (typeof doc.addEventListener != UNDEF) {
- doc.addEventListener("load", fn, false);
- }
- else if (typeof win.attachEvent != UNDEF) {
- addListener(win, "onload", fn);
- }
- else if (typeof win.onload == "function") {
- var fnOld = win.onload;
- win.onload = function() {
- fnOld();
- fn();
- };
- }
- else {
- win.onload = fn;
- }
- }
-
- /* Main function
- - Will preferably execute onDomLoad, otherwise onload (as a fallback)
- */
- function main() {
- if (plugin) {
- testPlayerVersion();
- }
- else {
- matchVersions();
- }
- }
-
- /* Detect the Flash Player version for non-Internet Explorer browsers
- - Detecting the plug-in version via the object element is more precise than using the plugins collection item's description:
- a. Both release and build numbers can be detected
- b. Avoid wrong descriptions by corrupt installers provided by Adobe
- c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports
- - Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available
- */
- function testPlayerVersion() {
- var b = doc.getElementsByTagName("body")[0];
- var o = createElement(OBJECT);
- o.setAttribute("type", FLASH_MIME_TYPE);
- var t = b.appendChild(o);
- if (t) {
- var counter = 0;
- (function(){
- if (typeof t.GetVariable != UNDEF) {
- var d = t.GetVariable("$version");
- if (d) {
- d = d.split(" ")[1].split(",");
- ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
- }
- }
- else if (counter < 10) {
- counter++;
- setTimeout(arguments.callee, 10);
- return;
- }
- b.removeChild(o);
- t = null;
- matchVersions();
- })();
- }
- else {
- matchVersions();
- }
- }
-
- /* Perform Flash Player and SWF version matching; static publishing only
- */
- function matchVersions() {
- var rl = regObjArr.length;
- if (rl > 0) {
- for (var i = 0; i < rl; i++) { // for each registered object element
- var id = regObjArr[i].id;
- var cb = regObjArr[i].callbackFn;
- var cbObj = {success:false, id:id};
- if (ua.pv[0] > 0) {
- var obj = getElementById(id);
- if (obj) {
- if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match!
- setVisibility(id, true);
- if (cb) {
- cbObj.success = true;
- cbObj.ref = getObjectById(id);
- cb(cbObj);
- }
- }
- else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported
- var att = {};
- att.data = regObjArr[i].expressInstall;
- att.width = obj.getAttribute("width") || "0";
- att.height = obj.getAttribute("height") || "0";
- if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); }
- if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); }
- // parse HTML object param element's name-value pairs
- var par = {};
- var p = obj.getElementsByTagName("param");
- var pl = p.length;
- for (var j = 0; j < pl; j++) {
- if (p[j].getAttribute("name").toLowerCase() != "movie") {
- par[p[j].getAttribute("name")] = p[j].getAttribute("value");
- }
- }
- showExpressInstall(att, par, id, cb);
- }
- else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF
- displayAltContent(obj);
- if (cb) { cb(cbObj); }
- }
- }
- }
- else { // if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content)
- setVisibility(id, true);
- if (cb) {
- var o = getObjectById(id); // test whether there is an HTML object element or not
- if (o && typeof o.SetVariable != UNDEF) {
- cbObj.success = true;
- cbObj.ref = o;
- }
- cb(cbObj);
- }
- }
- }
- }
- }
-
- function getObjectById(objectIdStr) {
- var r = null;
- var o = getElementById(objectIdStr);
- if (o && o.nodeName == "OBJECT") {
- if (typeof o.SetVariable != UNDEF) {
- r = o;
- }
- else {
- var n = o.getElementsByTagName(OBJECT)[0];
- if (n) {
- r = n;
- }
- }
- }
- return r;
- }
-
- /* Requirements for Adobe Express Install
- - only one instance can be active at a time
- - fp 6.0.65 or higher
- - Win/Mac OS only
- - no Webkit engines older than version 312
- */
- function canExpressInstall() {
- return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312);
- }
-
- /* Show the Adobe Express Install dialog
- - Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75
- */
- function showExpressInstall(att, par, replaceElemIdStr, callbackFn) {
- isExpressInstallActive = true;
- storedCallbackFn = callbackFn || null;
- storedCallbackObj = {success:false, id:replaceElemIdStr};
- var obj = getElementById(replaceElemIdStr);
- if (obj) {
- if (obj.nodeName == "OBJECT") { // static publishing
- storedAltContent = abstractAltContent(obj);
- storedAltContentId = null;
- }
- else { // dynamic publishing
- storedAltContent = obj;
- storedAltContentId = replaceElemIdStr;
- }
- att.id = EXPRESS_INSTALL_ID;
- if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; }
- if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; }
- doc.title = doc.title.slice(0, 47) + " - Flash Player Installation";
- var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn",
- fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title;
- if (typeof par.flashvars != UNDEF) {
- par.flashvars += "&" + fv;
- }
- else {
- par.flashvars = fv;
- }
- // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
- // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
- if (ua.ie && ua.win && obj.readyState != 4) {
- var newObj = createElement("div");
- replaceElemIdStr += "SWFObjectNew";
- newObj.setAttribute("id", replaceElemIdStr);
- obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf
- obj.style.display = "none";
- (function(){
- if (obj.readyState == 4) {
- obj.parentNode.removeChild(obj);
- }
- else {
- setTimeout(arguments.callee, 10);
- }
- })();
- }
- createSWF(att, par, replaceElemIdStr);
- }
- }
-
- /* Functions to abstract and display alternative content
- */
- function displayAltContent(obj) {
- if (ua.ie && ua.win && obj.readyState != 4) {
- // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
- // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
- var el = createElement("div");
- obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
- el.parentNode.replaceChild(abstractAltContent(obj), el);
- obj.style.display = "none";
- (function(){
- if (obj.readyState == 4) {
- obj.parentNode.removeChild(obj);
- }
- else {
- setTimeout(arguments.callee, 10);
- }
- })();
- }
- else {
- obj.parentNode.replaceChild(abstractAltContent(obj), obj);
- }
- }
-
- function abstractAltContent(obj) {
- var ac = createElement("div");
- if (ua.win && ua.ie) {
- ac.innerHTML = obj.innerHTML;
- }
- else {
- var nestedObj = obj.getElementsByTagName(OBJECT)[0];
- if (nestedObj) {
- var c = nestedObj.childNodes;
- if (c) {
- var cl = c.length;
- for (var i = 0; i < cl; i++) {
- if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
- ac.appendChild(c[i].cloneNode(true));
- }
- }
- }
- }
- }
- return ac;
- }
-
- /* Cross-browser dynamic SWF creation
- */
- function createSWF(attObj, parObj, id) {
- var r, el = getElementById(id);
- if (ua.wk && ua.wk < 312) { return r; }
- if (el) {
- if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content
- attObj.id = id;
- }
- if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML
- var att = "";
- for (var i in attObj) {
- if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries
- if (i.toLowerCase() == "data") {
- parObj.movie = attObj[i];
- }
- else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
- att += ' class="' + attObj[i] + '"';
- }
- else if (i.toLowerCase() != "classid") {
- att += ' ' + i + '="' + attObj[i] + '"';
- }
- }
- }
- var par = "";
- for (var j in parObj) {
- if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries
- par += '<param name="' + j + '" value="' + parObj[j] + '" />';
- }
- }
- el.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"' + att + '>' + par + '</object>';
- objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only)
- r = getElementById(attObj.id);
- }
- else { // well-behaving browsers
- var o = createElement(OBJECT);
- o.setAttribute("type", FLASH_MIME_TYPE);
- for (var m in attObj) {
- if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries
- if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
- o.setAttribute("class", attObj[m]);
- }
- else if (m.toLowerCase() != "classid") { // filter out IE specific attribute
- o.setAttribute(m, attObj[m]);
- }
- }
- }
- for (var n in parObj) {
- if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element
- createObjParam(o, n, parObj[n]);
- }
- }
- el.parentNode.replaceChild(o, el);
- r = o;
- }
- }
- return r;
- }
-
- function createObjParam(el, pName, pValue) {
- var p = createElement("param");
- p.setAttribute("name", pName);
- p.setAttribute("value", pValue);
- el.appendChild(p);
- }
-
- /* Cross-browser SWF removal
- - Especially needed to safely and completely remove a SWF in Internet Explorer
- */
- function removeSWF(id) {
- var obj = getElementById(id);
- if (obj && obj.nodeName == "OBJECT") {
- if (ua.ie && ua.win) {
- obj.style.display = "none";
- (function(){
- if (obj.readyState == 4) {
- removeObjectInIE(id);
- }
- else {
- setTimeout(arguments.callee, 10);
- }
- })();
- }
- else {
- obj.parentNode.removeChild(obj);
- }
- }
- }
-
- function removeObjectInIE(id) {
- var obj = getElementById(id);
- if (obj) {
- for (var i in obj) {
- if (typeof obj[i] == "function") {
- obj[i] = null;
- }
- }
- obj.parentNode.removeChild(obj);
- }
- }
-
- /* Functions to optimize JavaScript compression
- */
- function getElementById(id) {
- var el = null;
- try {
- el = doc.getElementById(id);
- }
- catch (e) {}
- return el;
- }
-
- function createElement(el) {
- return doc.createElement(el);
- }
-
- /* Updated attachEvent function for Internet Explorer
- - Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks
- */
- function addListener(target, eventType, fn) {
- target.attachEvent(eventType, fn);
- listenersArr[listenersArr.length] = [target, eventType, fn];
- }
-
- /* Flash Player and SWF content version matching
- */
- function hasPlayerVersion(rv) {
- var pv = ua.pv, v = rv.split(".");
- v[0] = parseInt(v[0], 10);
- v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0"
- v[2] = parseInt(v[2], 10) || 0;
- return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false;
- }
-
- /* Cross-browser dynamic CSS creation
- - Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php
- */
- function createCSS(sel, decl, media, newStyle) {
- if (ua.ie && ua.mac) { return; }
- var h = doc.getElementsByTagName("head")[0];
- if (!h) { return; } // to also support badly authored HTML pages that lack a head element
- var m = (media && typeof media == "string") ? media : "screen";
- if (newStyle) {
- dynamicStylesheet = null;
- dynamicStylesheetMedia = null;
- }
- if (!dynamicStylesheet || dynamicStylesheetMedia != m) {
- // create dynamic stylesheet + get a global reference to it
- var s = createElement("style");
- s.setAttribute("type", "text/css");
- s.setAttribute("media", m);
- dynamicStylesheet = h.appendChild(s);
- if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
- dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1];
- }
- dynamicStylesheetMedia = m;
- }
- // add style rule
- if (ua.ie && ua.win) {
- if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) {
- dynamicStylesheet.addRule(sel, decl);
- }
- }
- else {
- if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) {
- dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
- }
- }
- }
-
- function setVisibility(id, isVisible) {
- if (!autoHideShow) { return; }
- var v = isVisible ? "visible" : "hidden";
- if (isDomLoaded && getElementById(id)) {
- getElementById(id).style.visibility = v;
- }
- else {
- createCSS("#" + id, "visibility:" + v);
- }
- }
-
- /* Filter to avoid XSS attacks
- */
- function urlEncodeIfNecessary(s) {
- var regex = /[\\\"<>\.;]/;
- var hasBadChars = regex.exec(s) != null;
- return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s;
- }
-
- /* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only)
- */
- var cleanup = function() {
- if (ua.ie && ua.win) {
- window.attachEvent("onunload", function() {
- // remove listeners to avoid memory leaks
- var ll = listenersArr.length;
- for (var i = 0; i < ll; i++) {
- listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]);
- }
- // cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect
- var il = objIdArr.length;
- for (var j = 0; j < il; j++) {
- removeSWF(objIdArr[j]);
- }
- // cleanup library's main closures to avoid memory leaks
- for (var k in ua) {
- ua[k] = null;
- }
- ua = null;
- for (var l in swfobject) {
- swfobject[l] = null;
- }
- swfobject = null;
- });
- }
- }();
-
- return {
- /* Public API
- - Reference: http://code.google.com/p/swfobject/wiki/documentation
- */
- registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) {
- if (ua.w3 && objectIdStr && swfVersionStr) {
- var regObj = {};
- regObj.id = objectIdStr;
- regObj.swfVersion = swfVersionStr;
- regObj.expressInstall = xiSwfUrlStr;
- regObj.callbackFn = callbackFn;
- regObjArr[regObjArr.length] = regObj;
- setVisibility(objectIdStr, false);
- }
- else if (callbackFn) {
- callbackFn({success:false, id:objectIdStr});
- }
- },
-
- getObjectById: function(objectIdStr) {
- if (ua.w3) {
- return getObjectById(objectIdStr);
- }
- },
-
- embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) {
- var callbackObj = {success:false, id:replaceElemIdStr};
- if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) {
- setVisibility(replaceElemIdStr, false);
- addDomLoadEvent(function() {
- widthStr += ""; // auto-convert to string
- heightStr += "";
- var att = {};
- if (attObj && typeof attObj === OBJECT) {
- for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs
- att[i] = attObj[i];
- }
- }
- att.data = swfUrlStr;
- att.width = widthStr;
- att.height = heightStr;
- var par = {};
- if (parObj && typeof parObj === OBJECT) {
- for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs
- par[j] = parObj[j];
- }
- }
- if (flashvarsObj && typeof flashvarsObj === OBJECT) {
- for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs
- if (typeof par.flashvars != UNDEF) {
- par.flashvars += "&" + k + "=" + flashvarsObj[k];
- }
- else {
- par.flashvars = k + "=" + flashvarsObj[k];
- }
- }
- }
- if (hasPlayerVersion(swfVersionStr)) { // create SWF
- var obj = createSWF(att, par, replaceElemIdStr);
- if (att.id == replaceElemIdStr) {
- setVisibility(replaceElemIdStr, true);
- }
- callbackObj.success = true;
- callbackObj.ref = obj;
- }
- else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install
- att.data = xiSwfUrlStr;
- showExpressInstall(att, par, replaceElemIdStr, callbackFn);
- return;
- }
- else { // show alternative content
- setVisibility(replaceElemIdStr, true);
- }
- if (callbackFn) { callbackFn(callbackObj); }
- });
- }
- else if (callbackFn) { callbackFn(callbackObj); }
- },
-
- switchOffAutoHideShow: function() {
- autoHideShow = false;
- },
-
- ua: ua,
-
- getFlashPlayerVersion: function() {
- return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] };
- },
-
- hasFlashPlayerVersion: hasPlayerVersion,
-
- createSWF: function(attObj, parObj, replaceElemIdStr) {
- if (ua.w3) {
- return createSWF(attObj, parObj, replaceElemIdStr);
- }
- else {
- return undefined;
- }
- },
-
- showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) {
- if (ua.w3 && canExpressInstall()) {
- showExpressInstall(att, par, replaceElemIdStr, callbackFn);
- }
- },
-
- removeSWF: function(objElemIdStr) {
- if (ua.w3) {
- removeSWF(objElemIdStr);
- }
- },
-
- createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) {
- if (ua.w3) {
- createCSS(selStr, declStr, mediaStr, newStyleBoolean);
- }
- },
-
- addDomLoadEvent: addDomLoadEvent,
-
- addLoadEvent: addLoadEvent,
-
- getQueryParamValue: function(param) {
- var q = doc.location.search || doc.location.hash;
- if (q) {
- if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark
- if (param == null) {
- return urlEncodeIfNecessary(q);
- }
- var pairs = q.split("&");
- for (var i = 0; i < pairs.length; i++) {
- if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) {
- return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1)));
- }
- }
- }
- return "";
- },
-
- // For internal usage only
- expressInstallCallback: function() {
- if (isExpressInstallActive) {
- var obj = getElementById(EXPRESS_INSTALL_ID);
- if (obj && storedAltContent) {
- obj.parentNode.replaceChild(storedAltContent, obj);
- if (storedAltContentId) {
- setVisibility(storedAltContentId, true);
- if (ua.ie && ua.win) { storedAltContent.style.display = "block"; }
- }
- if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); }
- }
- isExpressInstallActive = false;
- }
- }
- };
-}();
View
17 zul/src/archive/web/js/zul/fchart/zk.wpd
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- zk.wpd
- Purpose:
-
- Description:
-
- History:
- Nov 26, 2009 11:34:41 AM , Created by joy
-
-Copyright (C) 2009 Potix Corporation. All Rights Reserved.
--->
-
-<package name="zul.fchart" language="xul/html" depends="zul.med">
- <widget name="Flashchart"/>
- <script src="swfobject.js"/>
-</package>
View
280 zul/src/org/zkoss/zul/Flashchart.java
@@ -1,280 +0,0 @@
-/* Flashchart.java
-
- Purpose:
-
- Description:
-
- History:
- Nov 26, 2009 11:58:42 AM , Created by joy
-
-Copyright (C) 2009 Potix Corporation. All Rights Reserved.
-
-{{IS_RIGHT
- This program is distributed under LGPL Version 2.1 in the hope that
- it will be useful, but WITHOUT ANY WARRANTY.
-}}IS_RIGHT
-*/
-package org.zkoss.zul;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.zkoss.json.JSONObject;
-import org.zkoss.lang.Objects;
-import org.zkoss.zk.ui.UiException;
-import org.zkoss.zk.ui.sys.ContentRenderer;
-import org.zkoss.zul.event.ChartDataEvent;
-import org.zkoss.zul.event.ChartDataListener;
-/**
- * The generic flash chart component. Developers set proper chart type, data model,
- * and the src attribute to draw proper chart. The model and type must match to each other;
- * or the result is unpredictable.
- *
- * <table>
- * <tr><th>type</th><th>model</th></tr>
- * <tr><td>pie</td><td>{@link PieModel}</td></tr>
- * <tr><td>bar</td><td>{@link CategoryModel}</td></tr>
- * <tr><td>line</td><td>{@link CategoryModel}</td></tr>
- * <tr><td>column</td><td>{@link CategoryModel}</td></tr>
- * <tr><td>stackbar</td><td>{@link CategoryModel}</td></tr>
- * <tr><td>stackcolumn</td><td>{@link XYModel}</td></tr>
- * </table>
- *
- * <p>Default {@link #getWidth}: 400px
- * <p>Default {@link #getHeight}: 200px
- *
- * @author Joy Lo
- * @since 5.0.0
- */
-public class Flashchart extends Flash {
-
- private static final long serialVersionUID = 20091126115842L;
- /**
- * Declares attributes.
- */
- private String _type = "pie";
- private String _chartStyle;
- private ChartModel _model;
- private ChartDataListener _dataListener;
- private LinkedList<JSONObject> _seriesList;
- private String _yAxis = "Series 1";
- private String _xAxis = "Series 2";
-
- /**
- * Sets default values.
- */
- public Flashchart() {
- setWidth("400px");
- setHeight("200px");
- }
- private class DefaultChartDataListener implements ChartDataListener, Serializable {
- private static final long serialVersionUID = 20091125153002L;
-
- public void onChange(ChartDataEvent event) {
- refresh();
- }
- }
- private void refresh() {
- smartUpdate("refresh", getJSONResponse(transferToJSONObject(getModel())));
- }
-
- /**
- * RenderProperties method will bind the attributes with FlashChart.js.
- */
- protected void renderProperties(ContentRenderer renderer) throws IOException {
- super.renderProperties(renderer);
- render(renderer, "type", _type.split(":")[0]);
- if (_chartStyle != null)
- render(renderer, "chartStyle", _chartStyle);
- render(renderer, "jsonModel", getJSONResponse(transferToJSONObject(getModel())));
- if (!_type.equals("pie"))
- render(renderer, "jsonSeries", getJSONResponse(_seriesList));
- }
-
- /**
- * Sets the type of chart.
- * <p>Default: "pie"
- * <p>Allowed Types: pie, line, bar, column, stackbar, stackcolumn
- */
- public void setType(String type) {
- if (!isValid(type))
- throw new UiException("Type must be one of the following: " +
- "pie, line, bar, column, stackbar, stackcolumn");
- if (!Objects.equals(_type, type)) {
- _type = type;
- invalidate(); // Always redraw
- }
- }
-
- /**
- * Returns the type of chart
- */
- public String getType() {
- return _type;
- }
-
- /**
- * Sets the model of chart. The chart will be redrawn if setting an different model.
- * <p>Only implement models which matched the allowed types
- * @param model
- * @see #setType(String)
- */
- public void setModel(ChartModel model) {
- if (_model != model) {
- if (_model != null)
- _model.removeChartDataListener(_dataListener);
-
- _model = model;
-
- if (_dataListener == null) {
- _dataListener = new DefaultChartDataListener();
- _model.addChartDataListener(_dataListener);
- }
- invalidate(); // Always redraw
- }
- }
-
- /**
- * Returns the model of chart.
- */
- public ChartModel getModel() {
- return _model;
- }
-
- /**
- * Sets X-Axis name of chart. If doesn't set this attribute, then default will shows Series 2.
- * <p>Default: Series 2
- * <p>Only used for StackColumnChart and it only works when the chart initial.
- */
- public void setXaxis(String xAxis) {
- if(xAxis != null){
- _xAxis = xAxis;
- invalidate(); // Always redraw
- }
- }
-
- /**
- * Returns the name of X-Axis
- */
- public String getXaxis() {
- return _xAxis;
- }
-
- /**
- * Sets Y-Axis name of chart. If doesn't set this attribute, then default will shows Series 1.
- * <p>Default: Series 1
- * <p>Only used for StackColumnChart and it only works when the chart initial.
- */
- public void setYaxis(String yAxis) {
- if (yAxis != null) {
- _yAxis = yAxis;
- invalidate(); // Always redraw
- }
- }
-
- /**
- * Returns the name of Y-Axis.
- */
- public String getYaxis() {
- return _yAxis;
- }
-
- /**
- * Sets the content style of flashchart.
- * <p>Default format: "Category-Attribute=Value", ex."legend-display=right"
- */
- public void setChartStyle(String chartStyle) {
- if (!Objects.equals(_chartStyle, chartStyle)) {
- _chartStyle = chartStyle;
- invalidate(); // Always redraw
- }
- }
-
- /**
- * Returns the content style.
- */
- public String getChartStyle() {
- return _chartStyle;
- }
-
- private List<JSONObject> transferToJSONObject(ChartModel model) {
- LinkedList<JSONObject> list = new LinkedList<JSONObject>();
-
- if (model == null || _type == null)
- return list;
-
- if ("pie".equals(_type)) {
- PieModel tempModel = (PieModel) model;
- for (int i = 0; i < tempModel.getCategories().size(); i++) {
- Comparable category = tempModel.getCategory(i);
- JSONObject json = new JSONObject();
- json.put("categoryField", category);
- json.put("dataField", tempModel.getValue(category));
- list.add(json);
- }
-
- } else {
- _seriesList = new LinkedList<JSONObject>();
- CategoryModel tempModel = (CategoryModel) model;
- int seriesLength = tempModel.getSeries().size();
- String fieldKey = isHorizontal(_type) ? "xField" : "yField";
- for (int i = 0; i < seriesLength; i++) {
- Comparable series = tempModel.getSeries(i);
- JSONObject json = new JSONObject();
- json.put(fieldKey, escape(series));
- json.put("displayName", series);
- _seriesList.add(json);
- }
- for (int i = 0; i < tempModel.getCategories().size(); i++) {
- Comparable category = tempModel.getCategory(i);
- JSONObject jData = new JSONObject();
- jData.put("values", category);
- for (int j = 0; j < seriesLength; j++) {
- Comparable series = tempModel.getSeries(j);
- jData.put(escape(series), tempModel.getValue(series, category));
- }
- list.add(jData);
- }
- }
- return list;
- }
-
-
-
- // helper //
- private static String escape(Object series) {
- return "'" + series + "'";
- }
-
- private static boolean isHorizontal(String type) {
- return "bar".equals(type) || "stackbar".equals(type);
- }
-
- private static final List _VALID_TYPES = Arrays.asList(new Object[] {
- "pie", "line", "bar", "column", "stackbar", "stackcolumn"
- });
-
- private static boolean isValid(String type) {
- return _VALID_TYPES.contains(type);
- }
-
- private static String getJSONResponse(List list) {
- // list may be null.
- if (list == null)
- return "";
-
- final StringBuffer sb = new StringBuffer().append('[');
- for (Iterator it = list.iterator(); it.hasNext();) {
- String s = String.valueOf(it.next());
- sb.append(s).append(',');
- }
- sb.deleteCharAt(sb.length() - 1);
- sb.append(']');
- return sb.toString().replaceAll("\\\\", "");
- }
-
-}
Please sign in to comment.
Something went wrong with that request. Please try again.