Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
543ba40
chore(gitignore): include bower components
PatrickJS Dec 29, 2014
dce5cde
chore(bower): include angular with mocks
PatrickJS Dec 29, 2014
3c84c75
chore: include karma conf
PatrickJS Dec 29, 2014
1784963
chore: build script
PatrickJS Dec 29, 2014
5c55414
chore(package.json): update devDependencies
PatrickJS Dec 29, 2014
8aad475
chore: allow test.sh/dist.sh with npm
PatrickJS Dec 29, 2014
6d820d9
chore(test): rename file and add tests
PatrickJS Dec 29, 2014
64fe2fc
feat: websocket mock
PatrickJS Dec 29, 2014
6ab6b64
refactor: $webSocket api
PatrickJS Dec 29, 2014
d0e8ac7
chore: build files
PatrickJS Dec 29, 2014
b54897b
chore(version): bump to 1.0.0
PatrickJS Dec 29, 2014
fcf6dd3
refactor(test): update to jasmine 2 from 1.3
PatrickJS Dec 29, 2014
f245e87
docs(readme): update with new api
PatrickJS Dec 29, 2014
905eeca
refactor(test): use more jasmine 2 api
PatrickJS Dec 29, 2014
ed817f5
chore(build): update build with map
PatrickJS Dec 29, 2014
53a0a0a
chore(dist): uglifyjs options
PatrickJS Dec 29, 2014
b0bd913
chore(bower): main as min
PatrickJS Dec 29, 2014
ec374f5
fix(test): test min
PatrickJS Dec 29, 2014
2977634
docs(readme): status and name
PatrickJS Dec 29, 2014
b82d796
chore: remove gruntfile and legacy module
PatrickJS Dec 29, 2014
4a35d4e
chore(.travis.yml): allow bower files
PatrickJS Dec 29, 2014
f13666e
chore: allow chrome/firefox in travis
PatrickJS Dec 29, 2014
571f0c3
docs(readme): update with badges and todo
PatrickJS Dec 29, 2014
05eff6d
docs(readme): include npm badge
PatrickJS Dec 29, 2014
c33acf8
docs(readme): bower version
PatrickJS Dec 29, 2014
4f4a4b7
docs(readme): update api, todo, Manual Tests
PatrickJS Dec 29, 2014
65c3c9e
feat($MockWebSocket): protocols and ssl
PatrickJS Dec 29, 2014
a987914
feat($WebSocket): protocols and ssl
PatrickJS Dec 29, 2014
57b953a
refactor(example): update with new api
PatrickJS Dec 29, 2014
2e302e7
refactor(*): rename $webSocket to $websocket
PatrickJS Dec 29, 2014
1223254
feat(*): legacy (ie8) support?
PatrickJS Dec 29, 2014
ae113eb
feat($WebSocketBackend): allow for commonjs ws
PatrickJS Dec 29, 2014
50294be
refactor($WebSocket): return this and readyState
PatrickJS Dec 29, 2014
7a48f93
chore(build): update build for 1.0.0
PatrickJS Dec 29, 2014
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
Prev Previous commit
Next Next commit
chore: allow test.sh/dist.sh with npm
  • Loading branch information
PatrickJS committed Dec 29, 2014
commit 8aad47589c288e25c339a8d38f39dde174bce824
4 changes: 2 additions & 2 deletions dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ mkdir -p dist/
cat src/angular-websocket.js > dist/angular-websocket.js
cat src/angular-websocket-mock.js > dist/angular-websocket-mock.js

uglifyjs src/angular-websocket.js > dist/angular-websocket.min.js
./node_modules/.bin/uglifyjs src/angular-websocket.js > dist/angular-websocket.min.js

echo "* built source files \ndist/angular-websocket.js\ndist/angular-websocket.min.js\ndist/angular-websocket-mock.js"
echo "* built source files \ndist/angular-websocket.js\ndist/angular-websocket.min.js\ndist/angular-websocket-mock.js\n"
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"description": "WebSocket service for Angular.js",
"homepage": "https://github.com/gdi2290/angular-websocket",
"bugs": "https://github.com/gdi2290/angular-websocket/issues",
"scripts": {
"test": "./test.sh",
"dist": "./dist.sh"
},
"author": {
"name": "Patrick Stapleton",
"email": "[email protected]",
Expand All @@ -19,8 +23,7 @@
"type": "MIT"
}
],
"dependencies": {
},
"dependencies": {},
"devDependencies": {
"http-server": "^0.6.1",
"karma": "^0.12.28",
Expand All @@ -33,6 +36,7 @@
"karma-script-launcher": "~0.1.0",
"karma-slimerjs-launcher": "^0.1.2",
"requirejs": "~2.1.10",
"uglify-js": "^2.4.16",
"ws": "^0.4.32"
}
}
2 changes: 2 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
./node_modules/karma/bin/karma start karma.conf.js