Skip to content

Commit

Permalink
Cleaned up name spacing and fixed link to backup jQuery
Browse files Browse the repository at this point in the history
  • Loading branch information
ten1seven committed Apr 24, 2012
1 parent 59efead commit 33ee045
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 20 deletions.
Binary file removed img/favicon.ico
Binary file not shown.
4 changes: 1 addition & 3 deletions index.html
Expand Up @@ -14,9 +14,7 @@
<!-- tell mobile browsers to scale -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

<title>Time Life</title>

<link rel="shortcut icon" href="img/favicon.ico">
<title>Project Boilerplate</title>

<!-- CSS: implied media="all" -->
<link rel="stylesheet" href="css/base.css">
Expand Down
8 changes: 4 additions & 4 deletions js/bootstrap.js
Expand Up @@ -4,15 +4,15 @@
Author: Jeremy Fields, Viget Labs
*/

var TL = TL || {};
var PB = PB || {};

(function() {
var body = document.body;

TL.controller = body.getAttribute('data-controller').toLowerCase();
TL.action = body.getAttribute('data-action').toLowerCase();
PB.controller = body.getAttribute('data-controller').toLowerCase();
PB.action = body.getAttribute('data-action').toLowerCase();
})();

TL.loadScripts = function(controller,action) {
PB.loadScripts = function(controller,action) {
$LAB.script([_base._global,pages[controller][action].depends],pages[controller][action].url);
};
12 changes: 6 additions & 6 deletions js/global.js
Expand Up @@ -4,13 +4,13 @@
Author: Jeremy Fields, Viget Labs
*/

var TL = TL || {};
var PB = PB || {};

(function () {

'use strict';

TL.Util = {
PB.Util = {

'init': function() {

Expand All @@ -20,16 +20,16 @@ var TL = TL || {};

};

TL.Global = {
PB.Global = {

vars: {
var1: 'hello world!'
var1: 'global.js init'
},

'init': function() {

// do stuff here
log(this.vars.var1);
console.log(PB.Global.var1);

},

Expand All @@ -44,4 +44,4 @@ var TL = TL || {};

}());

$(function() { TL.Global.init() });
$(function() { PB.Global.init() });
4 changes: 2 additions & 2 deletions js/init.js
Expand Up @@ -8,10 +8,10 @@ $LAB.script('//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.js','js/bootstr
if (typeof window.jQuery === 'undefined') {

// first load failed, load local fallback, then dependencies
$LAB.script('js/jquery.min.js').wait(TL.loadScripts(TL.controller,TL.action));
$LAB.script('js/libs/jquery-1.7.2.min.js').wait(PB.loadScripts(PB.controller,PB.action));
} else {

// first load was a success, proceed to loading dependencies
TL.loadScripts(TL.controller,TL.action);
PB.loadScripts(PB.controller,PB.action);
}
});
10 changes: 5 additions & 5 deletions js/pages/home.js
Expand Up @@ -4,22 +4,22 @@
Author: Jeremy Fields, Viget Labs
*/

var TL = TL || {};
var PB = PB || {};

(function () {

'use strict';

TL.Home = {
PB.Home = {

vars: {
var1: 'hello from the home page!'
var1: 'home.js init'
},

'init': function() {

// do stuff here
log(this.vars.var1);
console.log(PB.Home.vars.var1);

},

Expand All @@ -34,4 +34,4 @@ var TL = TL || {};

}());

$(function() { TL.Home.init() });
$(function() { PB.Home.init() });

0 comments on commit 33ee045

Please sign in to comment.