Skip to content
This repository has been archived by the owner on Jul 12, 2020. It is now read-only.

Commit

Permalink
minor changes, fresh build required after recent merges
Browse files Browse the repository at this point in the history
  • Loading branch information
addyosmani committed Feb 16, 2013
1 parent d5aff16 commit 352eada
Show file tree
Hide file tree
Showing 23 changed files with 23,333 additions and 22,644 deletions.
Binary file modified backbone-fundamentals.epub
Binary file not shown.
2,196 changes: 1,291 additions & 905 deletions backbone-fundamentals.md

Large diffs are not rendered by default.

3,325 changes: 1,653 additions & 1,672 deletions backbone-fundamentals.rtf

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions chapters/00-prelude.md
Expand Up @@ -11,6 +11,7 @@ This (in-progress) book is released under a Creative Commons Attribution-NonComm
I'm very pleased to announce that this book will be out in physical form (once complete) via [O'Reilly Media](http://shop.oreilly.com/product/0636920025344.do). Readers will have the option of purchasing the latest version in either print or a number of digital formats then or can grab a recent version from this repository.

Corrections to existing material are always welcome and I hope that together we can provide the community with an up-to-date resource that is of help.

My extended thanks go out to [Jeremy Ashkenas](https://github.com/jashkenas) for creating Backbone.js and [these](https://github.com/addyosmani/backbone-fundamentals/contributors) members of the community for their assistance tweaking this project.

I hope you find this book helpful!
Expand All @@ -25,10 +26,10 @@ This book is targeted at novice to intermediate developers wishing to learn how

I am indebted to the fantastic work done by the technical reviewers who helped improve this book. Their knowledge, energy and passion have helped shape it into a better learning resource and they continue to serve as a source of inspiration. Thanks go out to:

* Marc Friedman
* Dusan Gledovic
* Sindre Sorhus
* Mat Scales
* [Marc Friedman](http://github.com/dcmaf)
* [Mat Scales](http://github.com/wibblymat)
* [Dusan Gledovic](http://github.com/g6scheme)
* [Sindre Sorhus](http://github.com/sindresorhus)

## Credits

Expand Down
1,897 changes: 1,109 additions & 788 deletions index.html

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions practicals/modular-mobile-app/app/app-build.js
@@ -1,23 +1,23 @@
({
appDir: "./",
baseUrl: "./",
dir: "../release",
paths: {
'backbone': 'libs/AMDbackbone-0.5.3',
'underscore': 'libs/underscore-1.2.2',
'jquery': 'libs/jQuery-1.7.1',
'json2': 'libs/json2',
'datepicker': 'libs/jQuery.ui.datepicker',
'datepickermobile': 'libs/jquery.ui.datepicker.mobile',
'jquerymobile': 'libs/jquery.mobile-1.0'
},
optimize: "uglify",
modules: [
{
name: "app",
exclude: [
// If you prefer not to include certain libs exclude them here
]
}
]
})
({
appDir: "./",
baseUrl: "./",
dir: "../release",
paths: {
'backbone': 'libs/AMDbackbone-0.5.3',
'underscore': 'libs/underscore-1.2.2',
'jquery': 'libs/jQuery-1.7.1',
'json2': 'libs/json2',
'datepicker': 'libs/jQuery.ui.datepicker',
'datepickermobile': 'libs/jquery.ui.datepicker.mobile',
'jquerymobile': 'libs/jquery.mobile-1.0'
},
optimize: "uglify",
modules: [
{
name: "app",
exclude: [
// If you prefer not to include certain libs exclude them here
]
}
]
})
74 changes: 37 additions & 37 deletions practicals/modular-mobile-app/app/app.js
@@ -1,37 +1,37 @@
/*!
* Flickly - Backbone jQuery Mobile demo
* http://addyosmani.com
* Copyright (c) 2011 Addy Osmani
* Dual licensed under the MIT and GPL licenses.
*
*/
define( ['backbone', 'views/appview', 'routers/workspace', 'utils', 'ui'],
function( Backbone, AppView, Workspace, utils, ui ) {
// Using ECMAScript 5 strict mode during development. By default r.js will ignore that.
"use strict";

$(function(){

window.mobileSearch = window.mobileSearch || {
views: {
appview: new AppView
},
routers:{
workspace:new Workspace()
},
utils: utils,
ui: ui,
defaults:{
resultsPerPage: 16,
safeSearch: 2,
maxDate:'',
minDate:'01/01/1970'
}
}


window.mobileSearch.utils.toggleNavigation( false );
Backbone.history.start();
});

} );
/*!
* Flickly - Backbone jQuery Mobile demo
* http://addyosmani.com
* Copyright (c) 2011 Addy Osmani
* Dual licensed under the MIT and GPL licenses.
*
*/
define( ['backbone', 'views/appview', 'routers/workspace', 'utils', 'ui'],
function( Backbone, AppView, Workspace, utils, ui ) {
// Using ECMAScript 5 strict mode during development. By default r.js will ignore that.
"use strict";

$(function(){

window.mobileSearch = window.mobileSearch || {
views: {
appview: new AppView
},
routers:{
workspace:new Workspace()
},
utils: utils,
ui: ui,
defaults:{
resultsPerPage: 16,
safeSearch: 2,
maxDate:'',
minDate:'01/01/1970'
}
}


window.mobileSearch.utils.toggleNavigation( false );
Backbone.history.start();
});

} );

0 comments on commit 352eada

Please sign in to comment.