Permalink
Browse files

Merge branch 'master' of github.com:chance-an/backbone-mvc

Conflicts:
	README.md
  • Loading branch information...
chance-an committed Aug 12, 2012
2 parents 1f5da2a + 40b278e commit f9fef02db610ae15114cddbab686f110c0da3345
Showing with 8 additions and 10 deletions.
  1. +5 −1 README.md
  2. +3 −9 backbone-mvc.js
View
@@ -1,5 +1,7 @@
Backskin
========
+BackboneMVC
+===========
* Based on Backbone.
* This is a CakePHP-like controllers and url routing framework, but it is for the web front-end.
@@ -13,4 +15,6 @@ Examples
========
There are some examples under /example/ :
* _requirejs_ shows how to port BackboneMVC to your project with [RequireJS](http://requirejs.org/)
-* _scaffold_ shows a regular way of organizing your application using BackboneMVC.
+* _scaffold_ shows a regular way of organizing your application using BackboneMVC.
+
+ For a complete user manual, please see [http://chance-an.github.com/backbone-mvc/](http://chance-an.github.com/backbone-mvc/ ).
View
@@ -71,11 +71,11 @@
/**
* This is the base prototype of the Controller classes.
* The inheriting classes only expand the prototype so the trouble of handling
- * is saved.
+ * private constructor is saved.
* It makes sense that each controller is a singleton. The cases that a
* controller's state need to be shared across the application are more than the
- * ones that the states need to be kept independently. It also helps the user
- * logic share the same controller state as the one the Router uses.
+ * cases that the states need to be kept independently. It also helps the user
+ * logic shares the same controller state as the one the Router uses.
* However, if independent states are vital, one can extend a controller with
* empty members or define their method statelessly.
* @type {Class}
@@ -508,10 +508,4 @@
}
router._history.push([controller_name, action, _arguments]);
}
-
- window.debug = function () {
- return {
- 'ControllersPool':ControllersPool
- };
- };
})();

0 comments on commit f9fef02

Please sign in to comment.