Skip to content
Browse files

Merge branch 'master' of github.com:vistarmedia/quips

  • Loading branch information...
2 parents a312a18 + 3e685a7 commit 8eebfe5aab7a230d45f47560531f79e2d46dfbbc @jawsthegame jawsthegame committed Mar 28, 2013
View
2 Makefile
@@ -15,7 +15,7 @@ else
MOCHA=$(mocha)
endif
-export NODE_PATH=./
+export NODE_PATH=./lib
xunit:
$(MOCHA) -R xunit $(FILES)
View
48 index.coffee
@@ -0,0 +1,48 @@
+module.exports =
+ # Models
+ Model: require './lib/models/model'
+ Loader: require './lib/models/loader'
+ User: require './lib/models/user'
+
+ # Collections
+ Collection: require './lib/models/collection'
+ FilteredCollection: require './lib/models/filtered_collection'
+
+ # Views
+ View: require './lib/views/view'
+ DetailView: require './lib/views/detail_view'
+ ListView: require('./lib/views/list_view').ListView
+ LoginView: require './lib/views/login/login_view'
+ NavigationView: require './lib/views/navigation_view'
+ NoticeView: require './lib/views/notice_view'
+ RowView: require('./lib/views/list_view').RowView
+
+ # Controllers
+ Controller: require './lib/controllers/controller'
+ FormController: require './lib/controllers/form_controller'
+ LoginController: require './lib/controllers/login_controller'
+ NavigationController: require './lib/controllers/navigation_controller'
+
+ # Forms
+ FormView: require('./lib/lib/forms').FormView
+ stringField: require('./lib/lib/forms').stringField
+ intField: require('./lib/lib/forms').intField
+ moneyField: require('./lib/lib/forms').moneyField
+ boolField: require('./lib/lib/forms').boolField
+ dateField: require('./lib/lib/forms').dateField
+ dateTimeField: require('./lib/lib/forms').dateTimeField
+
+ # Formatters
+ formatters:
+ date: require('./lib/lib/format').date
+ dateTime: require('./lib/lib/format').dateTime
+ boolean: require('./lib/lib/format').boolean
+ money: require('./lib/lib/format').money
+ number: require('./lib/lib/format').number
+ modelNames: require('./lib/lib/format').modelNames
+ zipCode: require('./lib/lib/format').zipCode
+
+ # Test
+ ChaiExtensions: require './test/lib/chai_extensions'
+ MockHttpServer: require('./test/lib/mock_server').MockHttpServer
+ Combiner: require './lib/lib/combiner'
View
0 controllers/controller.coffee → lib/controllers/controller.coffee
File renamed without changes.
View
0 controllers/form_controller.coffee → lib/controllers/form_controller.coffee
File renamed without changes.
View
0 controllers/login_controller.coffee → lib/controllers/login_controller.coffee
File renamed without changes.
View
0 controllers/navigation_controller.coffee → lib/controllers/navigation_controller.coffee
File renamed without changes.
View
0 lib/combiner.coffee → lib/lib/combiner.coffee
File renamed without changes.
View
0 lib/date.js → lib/lib/date.js
File renamed without changes.
View
0 lib/events.coffee → lib/lib/events.coffee
File renamed without changes.
View
0 lib/format.coffee → lib/lib/format.coffee
File renamed without changes.
View
0 lib/forms.coffee → lib/lib/forms.coffee
File renamed without changes.
View
0 lib/jquery-ui-1.8.22.datepicker-only.min.js → ...b/jquery-ui-1.8.22.datepicker-only.min.js
File renamed without changes.
View
0 lib/jquery.blockUI.js → lib/lib/jquery.blockUI.js
File renamed without changes.
View
0 lib/sticky.coffee → lib/lib/sticky.coffee
File renamed without changes.
View
0 lib/stickysidebar.jquery.js → lib/lib/stickysidebar.jquery.js
File renamed without changes.
View
0 models/collection.coffee → lib/models/collection.coffee
File renamed without changes.
View
0 models/filtered_collection.coffee → lib/models/filtered_collection.coffee
File renamed without changes.
View
0 models/loader.coffee → lib/models/loader.coffee
File renamed without changes.
View
0 models/model.coffee → lib/models/model.coffee
File renamed without changes.
View
0 models/user.coffee → lib/models/user.coffee
File renamed without changes.
View
0 views/detail_view.coffee → lib/views/detail_view.coffee
File renamed without changes.
View
0 views/list_view.coffee → lib/views/list_view.coffee
File renamed without changes.
View
0 views/login/login_view.coffee → lib/views/login/login_view.coffee
File renamed without changes.
View
0 views/navigation_view.coffee → lib/views/navigation_view.coffee
File renamed without changes.
View
0 views/notice_view.coffee → lib/views/notice_view.coffee
File renamed without changes.
View
0 views/view.coffee → lib/views/view.coffee
File renamed without changes.
View
28 package.json
@@ -1,19 +1,19 @@
{
"name": "quips",
- "version": "0.1.3",
+ "version": "0.1.4",
"dependencies": {
- "coffee-script": "1.3.3",
- "jqueryify": "1.9.1",
- "json2ify": "0.0.1",
- "underscore": "1.4.3",
- "backbone": "0.9.10",
- "haml-coffee": "1.4.1",
- "hem": "0.2.7",
- "hem-haml-coffee": "0.0.3",
- "jsdom": "0.2.15",
- "mocha": "1.3.2",
- "chai": "1.2.0",
- "sinon": "1.5.2"
+ "coffee-script": "1.6.x",
+ "jqueryify": "1.9.1",
+ "json2ify": "0.0.1",
+ "underscore": "1.4.3",
+ "backbone": "0.9.10",
+ "haml-coffee": "1.4.1",
+ "hem": "0.2.9",
+ "hem-haml-coffee": "0.0.3",
+ "jsdom": "0.2.15",
+ "mocha": "1.3.2",
+ "chai": "1.2.0",
+ "sinon": "1.5.2"
},
"devDependencies": {},
"optionalDependencies": {},
@@ -26,7 +26,7 @@
"type": "git",
"url": "git://github.com/vistarmedia/quips.git"
},
- "main": "./quips",
+ "main": "./index.coffee",
"scripts": {
"test": "make test"
}
View
48 quips.coffee
@@ -1,48 +0,0 @@
-module.exports =
- # Models
- Model: require 'quips/models/model'
- Loader: require 'quips/models/loader'
- User: require 'quips/models/user'
-
- # Collections
- Collection: require 'quips/models/collection'
- FilteredCollection: require 'quips/models/filtered_collection'
-
- # Views
- View: require 'quips/views/view'
- DetailView: require 'quips/views/detail_view'
- ListView: require('quips/views/list_view').ListView
- LoginView: require 'quips/views/login/login_view'
- NavigationView: require 'quips/views/navigation_view'
- NoticeView: require 'quips/views/notice_view'
- RowView: require('quips/views/list_view').RowView
-
- # Controllers
- Controller: require 'quips/controllers/controller'
- FormController: require 'quips/controllers/form_controller'
- LoginController: require 'quips/controllers/login_controller'
- NavigationController: require 'quips/controllers/navigation_controller'
-
- # Forms
- FormView: require('quips/lib/forms').FormView
- stringField: require('quips/lib/forms').stringField
- intField: require('quips/lib/forms').intField
- moneyField: require('quips/lib/forms').moneyField
- boolField: require('quips/lib/forms').boolField
- dateField: require('quips/lib/forms').dateField
- dateTimeField: require('quips/lib/forms').dateTimeField
-
- # Formatters
- formatters:
- date: require('quips/lib/format').date
- dateTime: require('quips/lib/format').dateTime
- boolean: require('quips/lib/format').boolean
- money: require('quips/lib/format').money
- number: require('quips/lib/format').number
- modelNames: require('quips/lib/format').modelNames
- zipCode: require('quips/lib/format').zipCode
-
- # Test
- ChaiExtensions: require 'quips/test/lib/chai_extensions'
- MockHttpServer: require('quips/test/lib/mock_server').MockHttpServer
- Combiner: require 'quips/lib/combiner'

0 comments on commit 8eebfe5

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