Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Todo UI for FlightJS #1138

Closed
wants to merge 6 commits into from
Closed

New Todo UI for FlightJS #1138

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a258996
Upgraded app to use modules from npm and adjust to new Todo UI. Fligh…
margaritis Feb 8, 2015
41f3932
remove all bower components deps. added jasmine-flight and flightjs d…
margaritis Feb 8, 2015
e02cdb1
remove bower.json
margaritis Feb 8, 2015
1040d87
update package.json
margaritis Feb 8, 2015
9f66c04
updated gitignore and inlcude deps
margaritis Feb 8, 2015
53e3360
minor fix in package.json
margaritis Feb 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 40 additions & 1 deletion examples/flight/.gitignore
View file
Open in desktop
@@ -1 +1,40 @@
node_modules/
node_modules/.bin/*

node_modules/depot/*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The start at the end isn't really needed. Ignoring the folder itself will work too.

!node_modules/depot/depot.js

node_modules/es5-shim/*
!node_modules/es5-shim/es5-shim.js
!node_modules/es5-shim/es5-sham.js

node_modules/jquery/*
!node_modules/jquery/dist
node_modules/jquery/dist/*
!node_modules/jquery/dist/jquery.js

node_modules/flightjs/*
!node_modules/flightjs/lib

node_modules/requirejs/*
!node_modules/requirejs/require.js

node_modules/requirejs-text/*
!node_modules/requirejs-text/text.js

node_modules/todomvc-app-css/*
!node_modules/todomvc-app-css/index.css
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to actually include these files.


node_modules/todomvc-common/*
!node_modules/todomvc-common/base.css
!node_modules/todomvc-common/base.js


node_modules/karma/*
node_modules/karma-chrome-launcher/*
node_modules/karma-firefox-launcher/*
node_modules/karma-ie-launcher/*
node_modules/karma-jasmine/*
node_modules/karma-phantomjs-launcher/*
node_modules/jasmine-jquery/*
node_modules/jasmine-flight/*
node_modules/karma-safari-jasmine/*
12 changes: 6 additions & 6 deletions examples/flight/app/js/main.js
View file
Open in desktop
Expand Up @@ -4,12 +4,12 @@
require.config({
baseUrl: './',
paths: {
jquery: 'bower_components/jquery/dist/jquery',
es5shim: 'bower_components/es5-shim/es5-shim',
es5sham: 'bower_components/es5-shim/es5-sham',
text: 'bower_components/requirejs-text/text',
flight: 'bower_components/flight',
depot: 'bower_components/depot/depot',
jquery: 'node_modules/jquery/dist/jquery',
es5shim: 'node_modules/es5-shim/es5-shim',
es5sham: 'node_modules/es5-shim/es5-sham',
text: 'node_modules/requirejs-text/text',
flight: 'node_modules/flight',
depot: 'node_modules/depot/depot',
app: 'app/js',
templates: 'app/templates',
ui: 'app/js/ui',
Expand Down
10 changes: 2 additions & 8 deletions examples/flight/bower.json
View file
Open in desktop
Expand Up @@ -2,15 +2,9 @@
"name": "flight-todomvc",
"version": "0.0.0",
"dependencies": {
"depot": "~0.1.6",
"flight": "~1.3.0",
"jquery": "2.1.0",
"requirejs": "~2.1.15",
"todomvc-common": "~0.3.0",
"requirejs-text": "~2.0.13"
"flight": "~1.3.0"
},
"devDependencies": {
"jasmine-flight": "~4.0.0",
"jasmine-jquery": "~2.0.5"
"jasmine-flight": "~4.0.0"
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bower.json can be removed now

227 changes: 0 additions & 227 deletions examples/flight/bower_components/depot/depot.js
View file
Open in desktop

This file was deleted.