X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-utils.js;h=992242d15d2a72b9b6e3c0a8e706f14353d9c636;hb=d0da31d021ee7a89b378182a60bf28f0873fc87b;hp=5c55855213101a6df1c5ddac2574969c7a852e96;hpb=3a0e53a45ffaf12515f99f905221ba59490961fa;p=dygraphs.git diff --git a/dygraph-utils.js b/dygraph-utils.js index 5c55855..992242d 100644 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@ -11,8 +11,9 @@ * search) and generic DOM-manipulation functions. */ -/*jshint globalstrict: true */ -/*global Dygraph:false, G_vmlCanvasManager:false, Node:false */ +(function() { + +/*global Dygraph:false, Node:false */ "use strict"; Dygraph.LOG_SCALE = 10; @@ -54,8 +55,7 @@ Dygraph.getContext = function(canvas) { }; /** - * Add an event handler. This smooths a difference between IE and the rest of - * the world. + * Add an event handler. * @param {!Node} elem The element to add the event to. * @param {string} type The type of the event, e.g. 'click' or 'mousemove'. * @param {function(Event):(boolean|undefined)} fn The function to call @@ -63,12 +63,7 @@ Dygraph.getContext = function(canvas) { * @private */ Dygraph.addEvent = function addEvent(elem, type, fn) { - if (elem.addEventListener) { - elem.addEventListener(type, fn, false); - } else { - elem[type+fn] = function(){fn(window.event);}; - elem.attachEvent('on'+type, elem[type+fn]); - } + elem.addEventListener(type, fn, false); }; /** @@ -87,8 +82,7 @@ Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) { }; /** - * Remove an event handler. This smooths a difference between IE and the rest - * of the world. + * Remove an event handler. * @param {!Node} elem The element to remove the event from. * @param {string} type The type of the event, e.g. 'click' or 'mousemove'. * @param {function(Event):(boolean|undefined)} fn The function to call @@ -96,17 +90,7 @@ Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) { * @private */ Dygraph.removeEvent = function(elem, type, fn) { - if (elem.removeEventListener) { - elem.removeEventListener(type, fn, false); - } else { - try { - elem.detachEvent('on'+type, elem[type+fn]); - } catch(e) { - // We only detach event listeners on a "best effort" basis in IE. See: - // http://stackoverflow.com/questions/2553632/detachevent-not-working-with-named-inline-functions - } - elem[type+fn] = null; - } + elem.removeEventListener(type, fn, false); }; Dygraph.prototype.removeTrackedEvents_ = function() { @@ -200,13 +184,10 @@ Dygraph.findPos = function(obj) { if (obj.offsetParent) { var copyObj = obj; while (1) { - // NOTE: the if statement here is for IE8. var borderLeft = "0", borderTop = "0"; - if (window.getComputedStyle) { - var computedStyle = window.getComputedStyle(copyObj, null); - borderLeft = computedStyle.borderLeft || "0"; - borderTop = computedStyle.borderTop || "0"; - } + var computedStyle = window.getComputedStyle(copyObj, null); + borderLeft = computedStyle.borderLeft || "0"; + borderTop = computedStyle.borderTop || "0"; curleft += parseInt(borderLeft, 10) ; curtop += parseInt(borderTop, 10) ; curleft += copyObj.offsetLeft; @@ -699,22 +680,13 @@ Dygraph.clone = function(o) { }; /** - * Create a new canvas element. This is more complex than a simple - * document.createElement("canvas") because of IE and excanvas. + * Create a new canvas element. * * @return {!HTMLCanvasElement} * @private */ Dygraph.createCanvas = function() { - var canvas = document.createElement("canvas"); - - var isIE = (/MSIE/.test(navigator.userAgent) && !window.opera); - if (isIE && (typeof(G_vmlCanvasManager) != 'undefined')) { - canvas = G_vmlCanvasManager.initElement( - /**@type{!HTMLCanvasElement}*/(canvas)); - } - - return canvas; + return document.createElement('canvas'); }; /** @@ -894,72 +866,63 @@ Dygraph.repeatAndCleanup = function(repeatFn, maxFrames, framePeriodInMillis, })(); }; +// A whitelist of options that do not change pixel positions. +var pixelSafeOptions = { + 'annotationClickHandler': true, + 'annotationDblClickHandler': true, + 'annotationMouseOutHandler': true, + 'annotationMouseOverHandler': true, + 'axisLabelColor': true, + 'axisLineColor': true, + 'axisLineWidth': true, + 'clickCallback': true, + 'drawCallback': true, + 'drawHighlightPointCallback': true, + 'drawPoints': true, + 'drawPointCallback': true, + 'drawGrid': true, + 'fillAlpha': true, + 'gridLineColor': true, + 'gridLineWidth': true, + 'hideOverlayOnMouseOut': true, + 'highlightCallback': true, + 'highlightCircleSize': true, + 'interactionModel': true, + 'isZoomedIgnoreProgrammaticZoom': true, + 'labelsDiv': true, + 'labelsDivStyles': true, + 'labelsDivWidth': true, + 'labelsKMB': true, + 'labelsKMG2': true, + 'labelsSeparateLines': true, + 'labelsShowZeroValues': true, + 'legend': true, + 'panEdgeFraction': true, + 'pixelsPerYLabel': true, + 'pointClickCallback': true, + 'pointSize': true, + 'rangeSelectorPlotFillColor': true, + 'rangeSelectorPlotStrokeColor': true, + 'showLabelsOnHighlight': true, + 'showRoller': true, + 'strokeWidth': true, + 'underlayCallback': true, + 'unhighlightCallback': true, + 'zoomCallback': true +}; + /** * This function will scan the option list and determine if they * require us to recalculate the pixel positions of each point. + * TODO: move this into dygraph-options.js * @param {!Array.} labels a list of options to check. * @param {!Object} attrs * @return {boolean} true if the graph needs new points else false. * @private */ Dygraph.isPixelChangingOptionList = function(labels, attrs) { - // A whitelist of options that do not change pixel positions. - var pixelSafeOptions = { - 'annotationClickHandler': true, - 'annotationDblClickHandler': true, - 'annotationMouseOutHandler': true, - 'annotationMouseOverHandler': true, - 'axisLabelColor': true, - 'axisLineColor': true, - 'axisLineWidth': true, - 'clickCallback': true, - 'digitsAfterDecimal': true, - 'drawCallback': true, - 'drawHighlightPointCallback': true, - 'drawPoints': true, - 'drawPointCallback': true, - 'drawXGrid': true, - 'drawYGrid': true, - 'fillAlpha': true, - 'gridLineColor': true, - 'gridLineWidth': true, - 'hideOverlayOnMouseOut': true, - 'highlightCallback': true, - 'highlightCircleSize': true, - 'interactionModel': true, - 'isZoomedIgnoreProgrammaticZoom': true, - 'labelsDiv': true, - 'labelsDivStyles': true, - 'labelsDivWidth': true, - 'labelsKMB': true, - 'labelsKMG2': true, - 'labelsSeparateLines': true, - 'labelsShowZeroValues': true, - 'legend': true, - 'maxNumberWidth': true, - 'panEdgeFraction': true, - 'pixelsPerYLabel': true, - 'pointClickCallback': true, - 'pointSize': true, - 'rangeSelectorPlotFillColor': true, - 'rangeSelectorPlotStrokeColor': true, - 'showLabelsOnHighlight': true, - 'showRoller': true, - 'sigFigs': true, - 'strokeWidth': true, - 'underlayCallback': true, - 'unhighlightCallback': true, - 'xAxisLabelFormatter': true, - 'xTicker': true, - 'xValueFormatter': true, - 'yAxisLabelFormatter': true, - 'yValueFormatter': true, - 'zoomCallback': true - }; - // Assume that we do not require new points. // This will change to true if we actually do need new points. - var requiresNewPoints = false; // Create a dictionary of series names for faster lookup. // If there are no labels, then the dictionary stays empty. @@ -970,34 +933,44 @@ Dygraph.isPixelChangingOptionList = function(labels, attrs) { } } + // Scan through a flat (i.e. non-nested) object of options. + // Returns true/false depending on whether new points are needed. + var scanFlatOptions = function(options) { + for (var property in options) { + if (options.hasOwnProperty(property) && + !pixelSafeOptions[property]) { + return true; + } + } + return false; + }; + // Iterate through the list of updated options. for (var property in attrs) { - // Break early if we already know we need new points from a previous option. - if (requiresNewPoints) { - break; - } - if (attrs.hasOwnProperty(property)) { - // Find out of this field is actually a series specific options list. - if (seriesNamesDictionary[property]) { - // This property value is a list of options for this series. - // If any of these sub properties are not pixel safe, set the flag. - for (var subProperty in attrs[property]) { - // Break early if we already know we need new points from a previous option. - if (requiresNewPoints) { - break; - } - if (attrs[property].hasOwnProperty(subProperty) && !pixelSafeOptions[subProperty]) { - requiresNewPoints = true; - } + if (!attrs.hasOwnProperty(property)) continue; + + // Find out of this field is actually a series specific options list. + if (property == 'highlightSeriesOpts' || + (seriesNamesDictionary[property] && !attrs.series)) { + // This property value is a list of options for this series. + if (scanFlatOptions(attrs[property])) return true; + } else if (property == 'series' || property == 'axes') { + // This is twice-nested options list. + var perSeries = attrs[property]; + for (var series in perSeries) { + if (perSeries.hasOwnProperty(series) && + scanFlatOptions(perSeries[series])) { + return true; } - // If this was not a series specific option list, check if its a pixel changing property. - } else if (!pixelSafeOptions[property]) { - requiresNewPoints = true; } + } else { + // If this was not a series specific option list, check if it's a pixel + // changing property. + if (!pixelSafeOptions[property]) return true; } } - return requiresNewPoints; + return false; }; Dygraph.Circles = { @@ -1162,17 +1135,11 @@ Dygraph.toRGB_ = function(colorStr) { * @return {boolean} Whether the browser supports canvas. */ Dygraph.isCanvasSupported = function(opt_canvasElement) { - var canvas; try { - canvas = opt_canvasElement || document.createElement("canvas"); + var canvas = opt_canvasElement || document.createElement("canvas"); canvas.getContext("2d"); - } - catch (e) { - var ie = navigator.appVersion.match(/MSIE (\d\.\d)/); - var opera = (navigator.userAgent.toLowerCase().indexOf("opera") != -1); - if ((!ie) || (ie[1] < 6) || (opera)) - return false; - return true; + } catch (e) { + return false; } return true; }; @@ -1207,3 +1174,5 @@ Dygraph.parseFloat_ = function(x, opt_line_no, opt_line) { return null; }; + +})();