Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #11 from markchadwick/linkable

Make Quips npm-link-able (while still hem-friendly)
  • Loading branch information...
commit 3e685a732c623d470187dc8d8c3cea36b122a1a9 2 parents 96fe406 + 6ec6d22
Tom Fleischer jawsthegame authored

Showing 28 changed files with 63 additions and 63 deletions. Show diff stats Hide diff stats

  1. +1 1  Makefile
  2. +48 0 index.coffee
  3. 0  { → lib}/controllers/controller.coffee
  4. 0  { → lib}/controllers/form_controller.coffee
  5. 0  { → lib}/controllers/login_controller.coffee
  6. 0  { → lib}/controllers/navigation_controller.coffee
  7. 0  lib/{ → lib}/combiner.coffee
  8. 0  lib/{ → lib}/date.js
  9. 0  lib/{ → lib}/events.coffee
  10. 0  lib/{ → lib}/format.coffee
  11. 0  lib/{ → lib}/forms.coffee
  12. 0  lib/{ → lib}/jquery-ui-1.8.22.datepicker-only.min.js
  13. 0  lib/{ → lib}/jquery.blockUI.js
  14. 0  lib/{ → lib}/sticky.coffee
  15. 0  lib/{ → lib}/stickysidebar.jquery.js
  16. 0  { → lib}/models/collection.coffee
  17. 0  { → lib}/models/filtered_collection.coffee
  18. 0  { → lib}/models/loader.coffee
  19. 0  { → lib}/models/model.coffee
  20. 0  { → lib}/models/user.coffee
  21. 0  { → lib}/views/detail_view.coffee
  22. 0  { → lib}/views/list_view.coffee
  23. 0  { → lib}/views/login/login_view.coffee
  24. 0  { → lib}/views/navigation_view.coffee
  25. 0  { → lib}/views/notice_view.coffee
  26. 0  { → lib}/views/view.coffee
  27. +14 14 package.json
  28. +0 48 quips.coffee
2  Makefile
@@ -15,7 +15,7 @@ else
15 15 MOCHA=$(mocha)
16 16 endif
17 17
18   -export NODE_PATH=./
  18 +export NODE_PATH=./lib
19 19
20 20 xunit:
21 21 $(MOCHA) -R xunit $(FILES)
48 index.coffee
... ... @@ -0,0 +1,48 @@
  1 +module.exports =
  2 + # Models
  3 + Model: require './lib/models/model'
  4 + Loader: require './lib/models/loader'
  5 + User: require './lib/models/user'
  6 +
  7 + # Collections
  8 + Collection: require './lib/models/collection'
  9 + FilteredCollection: require './lib/models/filtered_collection'
  10 +
  11 + # Views
  12 + View: require './lib/views/view'
  13 + DetailView: require './lib/views/detail_view'
  14 + ListView: require('./lib/views/list_view').ListView
  15 + LoginView: require './lib/views/login/login_view'
  16 + NavigationView: require './lib/views/navigation_view'
  17 + NoticeView: require './lib/views/notice_view'
  18 + RowView: require('./lib/views/list_view').RowView
  19 +
  20 + # Controllers
  21 + Controller: require './lib/controllers/controller'
  22 + FormController: require './lib/controllers/form_controller'
  23 + LoginController: require './lib/controllers/login_controller'
  24 + NavigationController: require './lib/controllers/navigation_controller'
  25 +
  26 + # Forms
  27 + FormView: require('./lib/lib/forms').FormView
  28 + stringField: require('./lib/lib/forms').stringField
  29 + intField: require('./lib/lib/forms').intField
  30 + moneyField: require('./lib/lib/forms').moneyField
  31 + boolField: require('./lib/lib/forms').boolField
  32 + dateField: require('./lib/lib/forms').dateField
  33 + dateTimeField: require('./lib/lib/forms').dateTimeField
  34 +
  35 + # Formatters
  36 + formatters:
  37 + date: require('./lib/lib/format').date
  38 + dateTime: require('./lib/lib/format').dateTime
  39 + boolean: require('./lib/lib/format').boolean
  40 + money: require('./lib/lib/format').money
  41 + number: require('./lib/lib/format').number
  42 + modelNames: require('./lib/lib/format').modelNames
  43 + zipCode: require('./lib/lib/format').zipCode
  44 +
  45 + # Test
  46 + ChaiExtensions: require './test/lib/chai_extensions'
  47 + MockHttpServer: require('./test/lib/mock_server').MockHttpServer
  48 + Combiner: require './lib/lib/combiner'
0  controllers/controller.coffee → lib/controllers/controller.coffee
File renamed without changes
0  controllers/form_controller.coffee → lib/controllers/form_controller.coffee
File renamed without changes
0  controllers/login_controller.coffee → lib/controllers/login_controller.coffee
File renamed without changes
0  controllers/navigation_controller.coffee → lib/controllers/navigation_controller.coffee
File renamed without changes
0  lib/combiner.coffee → lib/lib/combiner.coffee
File renamed without changes
0  lib/date.js → lib/lib/date.js
File renamed without changes
0  lib/events.coffee → lib/lib/events.coffee
File renamed without changes
0  lib/format.coffee → lib/lib/format.coffee
File renamed without changes
0  lib/forms.coffee → lib/lib/forms.coffee
File renamed without changes
0  lib/jquery-ui-1.8.22.datepicker-only.min.js → lib/lib/jquery-ui-1.8.22.datepicker-only.min.js
File renamed without changes
0  lib/jquery.blockUI.js → lib/lib/jquery.blockUI.js
File renamed without changes
0  lib/sticky.coffee → lib/lib/sticky.coffee
File renamed without changes
0  lib/stickysidebar.jquery.js → lib/lib/stickysidebar.jquery.js
File renamed without changes
0  models/collection.coffee → lib/models/collection.coffee
File renamed without changes
0  models/filtered_collection.coffee → lib/models/filtered_collection.coffee
File renamed without changes
0  models/loader.coffee → lib/models/loader.coffee
File renamed without changes
0  models/model.coffee → lib/models/model.coffee
File renamed without changes
0  models/user.coffee → lib/models/user.coffee
File renamed without changes
0  views/detail_view.coffee → lib/views/detail_view.coffee
File renamed without changes
0  views/list_view.coffee → lib/views/list_view.coffee
File renamed without changes
0  views/login/login_view.coffee → lib/views/login/login_view.coffee
File renamed without changes
0  views/navigation_view.coffee → lib/views/navigation_view.coffee
File renamed without changes
0  views/notice_view.coffee → lib/views/notice_view.coffee
File renamed without changes
0  views/view.coffee → lib/views/view.coffee
File renamed without changes
28 package.json
... ... @@ -1,19 +1,19 @@
1 1 {
2 2 "name": "quips",
3   - "version": "0.1.3",
  3 + "version": "0.1.4",
4 4 "dependencies": {
5   - "coffee-script": "1.3.3",
6   - "jqueryify": "1.9.1",
7   - "json2ify": "0.0.1",
8   - "underscore": "1.4.3",
9   - "backbone": "0.9.10",
10   - "haml-coffee": "1.4.1",
11   - "hem": "0.2.7",
12   - "hem-haml-coffee": "0.0.3",
13   - "jsdom": "0.2.15",
14   - "mocha": "1.3.2",
15   - "chai": "1.2.0",
16   - "sinon": "1.5.2"
  5 + "coffee-script": "1.6.x",
  6 + "jqueryify": "1.9.1",
  7 + "json2ify": "0.0.1",
  8 + "underscore": "1.4.3",
  9 + "backbone": "0.9.10",
  10 + "haml-coffee": "1.4.1",
  11 + "hem": "0.2.9",
  12 + "hem-haml-coffee": "0.0.3",
  13 + "jsdom": "0.2.15",
  14 + "mocha": "1.3.2",
  15 + "chai": "1.2.0",
  16 + "sinon": "1.5.2"
17 17 },
18 18 "devDependencies": {},
19 19 "optionalDependencies": {},
@@ -26,7 +26,7 @@
26 26 "type": "git",
27 27 "url": "git://github.com/vistarmedia/quips.git"
28 28 },
29   - "main": "./quips",
  29 + "main": "./index.coffee",
30 30 "scripts": {
31 31 "test": "make test"
32 32 }
48 quips.coffee
... ... @@ -1,48 +0,0 @@
1   -module.exports =
2   - # Models
3   - Model: require 'quips/models/model'
4   - Loader: require 'quips/models/loader'
5   - User: require 'quips/models/user'
6   -
7   - # Collections
8   - Collection: require 'quips/models/collection'
9   - FilteredCollection: require 'quips/models/filtered_collection'
10   -
11   - # Views
12   - View: require 'quips/views/view'
13   - DetailView: require 'quips/views/detail_view'
14   - ListView: require('quips/views/list_view').ListView
15   - LoginView: require 'quips/views/login/login_view'
16   - NavigationView: require 'quips/views/navigation_view'
17   - NoticeView: require 'quips/views/notice_view'
18   - RowView: require('quips/views/list_view').RowView
19   -
20   - # Controllers
21   - Controller: require 'quips/controllers/controller'
22   - FormController: require 'quips/controllers/form_controller'
23   - LoginController: require 'quips/controllers/login_controller'
24   - NavigationController: require 'quips/controllers/navigation_controller'
25   -
26   - # Forms
27   - FormView: require('quips/lib/forms').FormView
28   - stringField: require('quips/lib/forms').stringField
29   - intField: require('quips/lib/forms').intField
30   - moneyField: require('quips/lib/forms').moneyField
31   - boolField: require('quips/lib/forms').boolField
32   - dateField: require('quips/lib/forms').dateField
33   - dateTimeField: require('quips/lib/forms').dateTimeField
34   -
35   - # Formatters
36   - formatters:
37   - date: require('quips/lib/format').date
38   - dateTime: require('quips/lib/format').dateTime
39   - boolean: require('quips/lib/format').boolean
40   - money: require('quips/lib/format').money
41   - number: require('quips/lib/format').number
42   - modelNames: require('quips/lib/format').modelNames
43   - zipCode: require('quips/lib/format').zipCode
44   -
45   - # Test
46   - ChaiExtensions: require 'quips/test/lib/chai_extensions'
47   - MockHttpServer: require('quips/test/lib/mock_server').MockHttpServer
48   - Combiner: require 'quips/lib/combiner'

0 comments on commit 3e685a7

Please sign in to comment.
Something went wrong with that request. Please try again.