From a619466452da9ccf03e04de8cad8a4c7e166e8d6 Mon Sep 17 00:00:00 2001 From: javi Date: Tue, 5 Nov 2013 08:57:32 +0100 Subject: [PATCH] updated cart library --- vendor/carto.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vendor/carto.js b/vendor/carto.js index 1602b94..292399e 100644 --- a/vendor/carto.js +++ b/vendor/carto.js @@ -4,8 +4,14 @@ var assert = { message = message || ''; if(!value) throw new Error("assertion failed", message); } +}; + +if (navigator.userAgent.indexOf('MSIE 8.0') !== -1 || navigator.userAgent.indexOf('MSIE 7.0') !== -1) { + Object.defineProperty = function(o, p, fn) { o[p] = fn.value; }; } + + var carto_initialize = function(carto, uri, callback) { callback(); }; @@ -1875,7 +1881,6 @@ function require(arg) { } return mod; } -var carto, tree, _; if (typeof(exports) !== 'undefined') { carto = exports; @@ -1885,6 +1890,7 @@ if (typeof(exports) !== 'undefined') { if (typeof(window.carto) === 'undefined') { window.carto = {}; } carto = window.carto; tree = window.carto.tree = {}; + _ = window._; } // carto.js - parser @@ -2501,7 +2507,7 @@ carto.Parser = function Parser(env) { var e, elements = []; var f, filters = new tree.Filterset(); var z, zoom = tree.Zoom.all; - var fo, frame_offset = tree.FrameOffset.null; + var fo, frame_offset = tree.FrameOffset.none; var segments = 0, conditions = 0; while ( @@ -3656,7 +3662,7 @@ tree.FrameOffset = function(op, value, index) { }; tree.FrameOffset.max = 32; -tree.FrameOffset.null = 0; +tree.FrameOffset.none = 0; (function(tree) { //