Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bramp/js-sequence-diagrams
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Moeditor/js-sequence-diagrams
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 7 commits
  • 10 files changed
  • 1 contributor

Commits on Aug 24, 2016

  1. Add version, deps, main in package.json

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    db00e8e View commit details

  2. Add build, and FUCK NPM!

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    b31fb0f View commit details

  3. FUCK NPM

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    61aba9a View commit details

  4. FUCK NPM

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    439e9b9 View commit details

  5. FUCK NPM

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    7c8ce46 View commit details

  6. FUCK NPM

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    ae21d12 View commit details

  7. FUCK NPM

    @Menci
    Menci committed Aug 24, 2016
    Copy the full SHA
    4d46bc6 View commit details
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
node_modules/
bower_components/
build/
30 changes: 15 additions & 15 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
NODE_MODULES := node_modules/.bin
BOWER_COMPONENTS := bower_components

all: node_modules lint build/sequence-diagram-min.js test
all: node_modules lint fucknpm/sequence-diagram-min.js test

node_modules: package.json
#
@@ -22,7 +22,7 @@ bower_components: bower.json
dependencies: node_modules bower_components

clean:
-rm build/*
-rm fucknpm/*

veryclean: clean
-rm -rf node_modules
@@ -34,33 +34,33 @@ lint: dependencies package.json bower.json
$(NODE_MODULES)/jsonlint package.json -q
$(NODE_MODULES)/jsonlint bower.json -q

test: dependencies build/sequence-diagram-min.js
test: dependencies fucknpm/sequence-diagram-min.js

# Test the un-minifed file (with underscore)
$(NODE_MODULES)/qunit \
-c build/sequence-diagram.js \
-c fucknpm/sequence-diagram.js \
-t test/*-tests.js \
-d test/raphael-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js

# Test the un-minifed file (with lodash)
$(NODE_MODULES)/qunit \
-c build/sequence-diagram.js \
-c fucknpm/sequence-diagram.js \
-t test/*-tests.js \
-d test/raphael-mock.js $(BOWER_COMPONENTS)/lodash/dist/lodash.min.js

# Test the minifed file (with underscore)
$(NODE_MODULES)/qunit \
-c build/sequence-diagram-min.js \
-c fucknpm/sequence-diagram-min.js \
-t test/*-tests.js \
-d test/raphael-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js

# Test the minifed file (with lodash)
$(NODE_MODULES)/qunit \
-c build/sequence-diagram-min.js \
-c fucknpm/sequence-diagram-min.js \
-t test/*-tests.js \
-d test/raphael-mock.js $(BOWER_COMPONENTS)/lodash/dist/lodash.min.js

build/grammar.js: src/grammar.jison
fucknpm/grammar.js: src/grammar.jison
$(NODE_MODULES)/jison $< -o $@.tmp

# After building the grammar, run it through the uglifyjs to fix some non-strict issues.
@@ -69,30 +69,30 @@ build/grammar.js: src/grammar.jison
$@.tmp -o $@ \
--comments all --compress --beautify

build/diagram-grammar.js: src/diagram.js build/grammar.js
fucknpm/diagram-grammar.js: src/diagram.js fucknpm/grammar.js
#
# Compiling grammar
#
$(NODE_MODULES)/preprocess $< . > $@

build/sequence-diagram.js: src/main.js build/diagram-grammar.js src/jquery-plugin.js fonts/daniel/daniel_700.font.js src/sequence-diagram.js
fucknpm/sequence-diagram.js: src/main.js fucknpm/diagram-grammar.js src/jquery-plugin.js fonts/daniel/daniel_700.font.js src/sequence-diagram.js
#
# Finally combine all javascript files together
#
$(NODE_MODULES)/preprocess $< . > $@

build/sequence-diagram-min.js build/sequence-diagram-min.js.map: build/sequence-diagram.js
fucknpm/sequence-diagram-min.js fucknpm/sequence-diagram-min.js.map: fucknpm/sequence-diagram.js
#
# Please ignore the warnings below (these are in combined js code)
#
$(NODE_MODULES)/uglifyjs \
build/sequence-diagram.js \
-o build/sequence-diagram-min.js \
fucknpm/sequence-diagram.js \
-o fucknpm/sequence-diagram-min.js \
--compress --comments --lint \
--source-map build/sequence-diagram-min.js.map \
--source-map fucknpm/sequence-diagram-min.js.map \
--source-map-url sequence-diagram-min.js.map

#
# Copy minified file to site
#
cp build/sequence-diagram-min.js* _site/
cp fucknpm/sequence-diagram-min.js* _site/
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"authors": "Andrew Brampton (bramp.net)",
"description": "Generates UML sequence diagrams from simple text",
"homepage": "http://bramp.github.io/js-sequence-diagrams/",
"main": "build/sequence-diagram-min.js",
"main": "fucknpm/sequence-diagram-min.js",
"namespace": "Diagram",
"keywords": [
"uml",
Loading