X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plotkit_v091%2FPlotKit%2FBase.js;h=41f16caefb71889d52a80b747c12aa65b014a480;hb=73a464171469a18a7f2cc55a98762c4b31e3754f;hp=49988c9a58d13a4ba33bd3ae3c8e4b549a3c43ec;hpb=6a1aa64f6d22473e0357ad1cd7bd93259d899a69;p=dygraphs.git diff --git a/plotkit_v091/PlotKit/Base.js b/plotkit_v091/PlotKit/Base.js index 49988c9..41f16ca 100644 --- a/plotkit_v091/PlotKit/Base.js +++ b/plotkit_v091/PlotKit/Base.js @@ -19,14 +19,13 @@ try { if (typeof(MochiKit.Base) == 'undefined' || typeof(MochiKit.DOM) == 'undefined' || - typeof(MochiKit.Color) == 'undefined' || - typeof(MochiKit.Format) == 'undefined') + typeof(MochiKit.Color) == 'undefined') { throw ""; } } catch (e) { - throw "PlotKit depends on MochiKit.{Base,Color,DOM,Format}" + throw "PlotKit depends on MochiKit.{Base,Color,DOM}" } // ------------------------------------------------------------------- @@ -98,13 +97,6 @@ PlotKit.Base.usingPrototype = function() { MochiKit.Base.update(PlotKit.Base, { - roundInterval: function(range, intervals, precision) { - // We want to make the interval look regular, - var trunc = MochiKit.Format.roundToFixed; - var sep = range/intervals; - return parseFloat(trunc(sep, precision)); - }, - collapse: function(lst) { var m = MochiKit.Base; var biggerList = new Array(); @@ -139,40 +131,6 @@ MochiKit.Base.update(PlotKit.Base, { return uniq; }, - colorScheme: function() { - var mb = MochiKit.Base; - var mc = MochiKit.Color - var scheme = ["red", "orange", "yellow", "green", "cyan", "blue", "purple", "magenta"]; - - var makeColor = function(name) { - return mc.Color[name + "Color"]() - }; - - return mb.map(makeColor, scheme); - }, - - baseDarkPrimaryColors: function () { - var hexColor = MochiKit.Color.Color.fromHexString; - return [hexColor("#ad3f40"), - hexColor("#ddac2c"), - hexColor("#dfdd0c"), - hexColor("#5276c4"), - hexColor("#739c5a")]; - }, - - basePrimaryColors: function () { - var hexColor = MochiKit.Color.Color.fromHexString; - return [hexColor("#d24c4d"), - hexColor("#f2b32f"), - hexColor("#ece90e"), - hexColor("#5d83da"), - hexColor("#78a15d")]; - }, - - baseBlueColors: function () { - var hexColor = MochiKit.Color.Color.fromHexString; - return [hexColor("#4b6b94"), hexColor("#5d81b4"), hexColor("#acbad2")]; - }, palette: function(baseColor, fromLevel, toLevel, increment) { var isNil = MochiKit.Base.isUndefinedOrNull; @@ -286,7 +244,6 @@ PlotKit.Base.keys = function(lst) { // // colour schemes // - PlotKit.Base.baseColors = function () { var hexColor = MochiKit.Color.Color.fromHexString; return [hexColor("#476fb2"), @@ -298,91 +255,11 @@ PlotKit.Base.baseColors = function () { hexColor("#000000")]; }; -PlotKit.Base.officeBaseStyle = { - "axisLineWidth": 2.0, - "axisLabelColor": Color.grayColor(), - "axisLineColor": Color.whiteColor(), - "padding": {top: 5, bottom: 10, left: 30, right: 30} -}; - -MochiKit.Base.update(PlotKit.Base,{ - officeBlue: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[0]), - "backgroundColor": PlotKit.Base.baseColors()[0].lighterColorWithLevel(0.45) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - officeRed: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[1]), - "backgroundColor": PlotKit.Base.baseColors()[1].lighterColorWithLevel(0.5) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - officeGreen: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[2]), - "backgroundColor": PlotKit.Base.baseColors()[2].lighterColorWithLevel(0.5) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - officePurple: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[3]), - "backgroundColor": PlotKit.Base.baseColors()[3].lighterColorWithLevel(0.5) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - - officeCyan: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[4]), - "backgroundColor": PlotKit.Base.baseColors()[4].lighterColorWithLevel(0.5) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - - officeOrange: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[5]), - "backgroundColor": PlotKit.Base.baseColors()[5].lighterColorWithLevel(0.4) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - }, - - officeBlack: function() { - var r = { - "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[6], 0.0, 0.6), - "backgroundColor": PlotKit.Base.baseColors()[6].lighterColorWithLevel(0.9) - }; - MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle); - return r; - } -}); - - PlotKit.Base.EXPORT = [ "baseColors", "collapse", - "colorScheme", "findPosX", "findPosY", - "officeBaseStyle", - "officeBlue", - "officeRed", - "officeGreen", - "officePurple", - "officeCyan", - "officeOrange", - "officeBlack", - "roundInterval", "uniq", "isFuncLike", "excanvasSupported"