This repository has been archived by the owner on Jul 12, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
minor changes, fresh build required after recent merges
- Loading branch information
1 parent
d5aff16
commit 352eada
Showing
23 changed files
with
23,333 additions
and
22,644 deletions.
There are no files selected for viewing
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
] | ||
} | ||
] | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
}); | ||
|
||
} ); |
Oops, something went wrong.