Skip to content

Commit

Permalink
v0.13.6
Browse files Browse the repository at this point in the history
  • Loading branch information
smasala committed Aug 13, 2015
1 parent bff0bf0 commit 008d87f
Show file tree
Hide file tree
Showing 32 changed files with 45 additions and 41 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Firebrick JS version: 0.13.4
#Firebrick JS version: 0.13.6

JavaScript MVC Framework built with:

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"framework",
"javascript"
],
"version": "0.13.4",
"version": "0.13.6",
"dependencies": {
"jquery": "2.x",
"knockoutjs": "3.x",
Expand Down
4 changes: 2 additions & 2 deletions dist/firebrick.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/classes/Boot.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Controllers.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Data.Store.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Data.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Events.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Firebrick.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Languages.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Router.Hashbang.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Router.History.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Router.Router.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Router.class.Base.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Router.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Templates.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/Views.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/controller.Base.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/store.Base.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/view.Base.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/classes/window.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"project": {
"name": "Firebrick JS API",
"description": "Firebrick JS API: A lightweight JavaScript MVC Framework powered with jQuery, Bootstrap, Knockout JS and Require JS",
"version": "0.13.4",
"version": "0.13.6",
"url": "https://github.com/smasala",
"logo": "fb_small.png"
},
Expand Down
12 changes: 6 additions & 6 deletions docs/files/src_firebrick.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down Expand Up @@ -133,7 +133,7 @@ <h1 class="file-heading">File: src\firebrick.js</h1>
/*!
* Firebrick JS - JavaScript MVC Framework powered by jQuery and Knockout JS
* @author Steven Masala [[email protected]]
* @version 0.13.4
* @version 0.13.6
*/

(function (root, factory) {
Expand Down Expand Up @@ -170,7 +170,7 @@ <h1 class="file-heading">File: src\firebrick.js</h1>
* @property version
* @type {String}
*/
version: &quot;0.13.4&quot;,
version: &quot;0.13.6&quot;,

/**2
* used to store configurations set Firebrick.ready()
Expand Down Expand Up @@ -2303,7 +2303,7 @@ <h1 class="file-heading">File: src\firebrick.js</h1>

if(match){

params = me._getParamsForMatch( match );
params = me._getParamsForMatch( match ).arr || [];

//are dependencies required to run this pattern
if($.isPlainObject(match) &amp;&amp; match.require){
Expand All @@ -2315,7 +2315,7 @@ <h1 class="file-heading">File: src\firebrick.js</h1>

require(deps, function(){
//check if pattern has a callback and fire
me._routeCallback( match.callback, [params.arr, arguments, args] );
me._routeCallback( match.callback, [params, arguments, args] );
});
}else{
//no dependencies - just fire the callback
Expand All @@ -2328,7 +2328,7 @@ <h1 class="file-heading">File: src\firebrick.js</h1>
callback = match;
}

me._routeCallback( callback, [args] );
me._routeCallback( callback, [params, args] );
}

}
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/Firebrick.class.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/Firebrick.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/Global.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1><img src="..\fb_small.png" title="Firebrick JS API"></h1>

</div>
<div class="yui3-u-1-4 version">
<em>API Docs for: 0.13.4</em>
<em>API Docs for: 0.13.6</em>
</div>
</div>
<div id="bd" class="yui3-g">
Expand Down
4 changes: 4 additions & 0 deletions release-notes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v0.13.6
----------------------------
* fix router when no require array is defined

v0.13.5
----------------------------
* router regex improvements
Expand Down
10 changes: 5 additions & 5 deletions src/firebrick.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Firebrick JS - JavaScript MVC Framework powered by jQuery and Knockout JS
* @author Steven Masala [[email protected]]
* @version 0.13.4
* @version 0.13.6
*/

(function (root, factory) {
Expand Down Expand Up @@ -38,7 +38,7 @@
* @property version
* @type {String}
*/
version: "0.13.4",
version: "0.13.6",

/**2
* used to store configurations set Firebrick.ready()
Expand Down Expand Up @@ -2171,7 +2171,7 @@

if(match){

params = me._getParamsForMatch( match );
params = me._getParamsForMatch( match ).arr || [];

//are dependencies required to run this pattern
if($.isPlainObject(match) && match.require){
Expand All @@ -2183,7 +2183,7 @@

require(deps, function(){
//check if pattern has a callback and fire
me._routeCallback( match.callback, [params.arr, arguments, args] );
me._routeCallback( match.callback, [params, arguments, args] );
});
}else{
//no dependencies - just fire the callback
Expand All @@ -2196,7 +2196,7 @@
callback = match;
}

me._routeCallback( callback, [args] );
me._routeCallback( callback, [params, args] );
}

}
Expand Down
2 changes: 1 addition & 1 deletion yuidoc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Firebrick JS API",
"description": "Firebrick JS API: A lightweight JavaScript MVC Framework powered with jQuery, Bootstrap, Knockout JS and Require JS",
"version": "0.13.4",
"version": "0.13.6",
"url": "https://github.com/smasala",
"logo": "fb_small.png",
"options": {
Expand Down

0 comments on commit 008d87f

Please sign in to comment.