Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

adds support for browserify #379

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#

expresso = ./node_modules/.bin/mocha
BROWSERIFY = ./node_modules/.bin/browserify

lint:
./node_modules/.bin/jshint lib/carto/*.js lib/carto/tree/*.js
Expand All @@ -17,4 +18,10 @@ endif

check: test

dist:
mkdir -p dist

dist/carto.uncompressed.js: dist $(shell $(BROWSERIFY) --list lib/carto/index.js)
$(BROWSERIFY) --debug lib/carto/index.js --standalone carto > $@

.PHONY: test
40 changes: 30 additions & 10 deletions lib/carto/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ var util = require('util'),


function getVersion() {
if (parseInt(process.version.split('.')[1], 10) > 4) {
if (process.browser) {
return require('../../package.json').version.split('.');
} else if (parseInt(process.version.split('.')[1], 10) > 4) {
return require('../../package.json').version.split('.');
} else {
// older node
Expand Down Expand Up @@ -64,15 +66,33 @@ var carto = {
}
};

[ 'call', 'color', 'comment', 'definition', 'dimension',
'element', 'expression', 'filterset', 'filter', 'field',
'keyword', 'layer', 'literal', 'operation', 'quoted', 'imagefilter',
'reference', 'rule', 'ruleset', 'selector', 'style', 'url', 'value',
'variable', 'zoom', 'invalid', 'fontset'
].forEach(function(n) {
require('./tree/' + n);
});

require('./tree/call');
require('./tree/color');
require('./tree/comment');
require('./tree/definition');
require('./tree/dimension');
require('./tree/element');
require('./tree/expression');
require('./tree/filterset');
require('./tree/filter');
require('./tree/field');
require('./tree/keyword');
require('./tree/layer');
require('./tree/literal');
require('./tree/operation');
require('./tree/quoted');
require('./tree/imagefilter');
require('./tree/reference');
require('./tree/rule');
require('./tree/ruleset');
require('./tree/selector');
require('./tree/style');
require('./tree/url');
require('./tree/value');
require('./tree/variable');
require('./tree/zoom');
require('./tree/invalid');
require('./tree/fontset');
require('./functions');

for (var k in carto) { exports[k] = carto[k]; }
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"jshint": "0.2.x",
"sax": "0.1.x",
"istanbul": "~0.2.14",
"coveralls": "~2.10.1"
"coveralls": "~2.10.1",
"browserify": "~7.0.0"
},
"scripts": {
"pretest": "npm install",
Expand Down