Skip to content

Commit

Permalink
Cleaned up vapour.js formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjackson28
pjackson28 committed Oct 14, 2013
1 parent 050dea4 commit 4696465
Show file tree
Hide file tree
Showing 2 changed files with 197 additions and 201 deletions.
319 changes: 158 additions & 161 deletions src/core/vapour.js
View file
Expand Up @@ -16,186 +16,186 @@
* @return {Object} of the parts of passed URL
*/
var getUrlParts = function( url ) {
var a = document.createElement( "a" );
a.href = url;
return {
href: a.href,
absolute: a.href,
host: a.host,
hostname: a.hostname,
port: a.port,
pathname: a.pathname,
protocol: a.protocol,
hash: a.hash,
search: a.search,
// A collection of the parameters of the query string part of the URL.
params: (function() {
var key, strings, segment, _i, _len,
results = {};
segment = a.search.replace( /^\?/, "" ).split( "&" );
_len = segment.length;
for ( _i = 0; _i !== _len; _i += 1 ) {
key = segment[ _i ];
if ( key ) {
strings = key.split( "=" );
results[ strings[ 0 ] ] = strings[ 1 ];
var a = document.createElement( "a" );
a.href = url;
return {
href: a.href,
absolute: a.href,
host: a.host,
hostname: a.hostname,
port: a.port,
pathname: a.pathname,
protocol: a.protocol,
hash: a.hash,
search: a.search,

// A collection of the parameters of the query string part of the URL.
params: (function() {
var key, strings, segment, _i, _len,
results = {};
segment = a.search.replace( /^\?/, "" ).split( "&" );
_len = segment.length;
for ( _i = 0; _i !== _len; _i += 1 ) {
key = segment[ _i ];
if ( key ) {
strings = key.split( "=" );
results[ strings[ 0 ] ] = strings[ 1 ];
}
}
}
return results;
}())
};
},

/*
* @variable $src
* @return {jQuery Element} of vapour script element
*/
$src = $( "script[src$='vapour.js'],script[src$='vapour.min.js']" )
.last(),

/*
* @variable i18n
* @return {string} of HTML document language
*/
i18n = document.documentElement.lang,

/*
* @variable $homepath
* @return {string} of version current path to JS directory
*/
$homepath = $src.prop( "src" )
.split( "?" )[ 0 ].split( "/" )
.slice( 0, -1 )
.join( "/" ),

/*
* @variable $mode
* @return {string} of version of JS [development or production]
*/
$mode = $src.prop( "src" )
.indexOf( ".min" ) < 0 ? "" : ".min",

/*
* @variable oldie
* @return {integer} of IE version
*/
oldie = (function() {
var undef,
v = 3,
div = document.createElement("div"),
all = div.getElementsByTagName("i");

while (
div.innerHTML = "<!--[if gt IE " + ( ++v ) + "]><i></i><![endif]-->",
all[0]
){}

return v > 4 ? v : undef;
}()),

/*
* @variable currentpage
* @return {Object} of parts of the current page URL
*/
currentpage = getUrlParts( window.location.href ),

/*
* @variable disabled
* @return {boolean} of state of disabled flag
*/
disabled = (function() {
var disabled = currentpage.params.wbdisable,
toBoolean = function( sBoolean ) {
return (/^true$/i).test( sBoolean.toString() );
};

if ( disabled === undefined && localStorage && localStorage.getItem( "wbdisable" ) ) {
disabled = localStorage.getItem( "wbdisable" );
}
return toBoolean( disabled );
}()),

/*-----------------------------
Vapour Core Object
----------------------------- */

vapour = {
"/": $homepath,
"/assets": "" + $homepath + "/assets",
"/templates": "" + $homepath + "/assets/templates",
"/deps": "" + $homepath + "/deps",
mode: $mode,
doc: $( document ),
win: $( window ),
html: $( "html" ),
sDisabled: "#wb-tphp",
pageUrlParts: currentpage,
getUrlParts: getUrlParts,
isDisabled : disabled,

getPath: function( property ) {
return this.hasOwnProperty( property ) ? this[ property ] : undef;
return results;
}())
};
},

getMode: function() {
return this.mode;
},
/*
* @variable $src
* @return {jQuery Element} of vapour script element
*/
$src = $( "script[src$='vapour.js'],script[src$='vapour.min.js']" )
.last(),

/*
* @variable i18n
* @return {string} of HTML document language
*/
i18n = document.documentElement.lang,

/*
* @variable $homepath
* @return {string} of version current path to JS directory
*/
$homepath = $src.prop( "src" )
.split( "?" )[ 0 ].split( "/" )
.slice( 0, -1 )
.join( "/" ),

/*
* @variable $mode
* @return {string} of version of JS [development or production]
*/
$mode = $src.prop( "src" )
.indexOf( ".min" ) < 0 ? "" : ".min",

/*
* @variable oldie
* @return {integer} of IE version
*/
oldie = (function() {
var undef,
v = 3,
div = document.createElement( "div" ),
all = div.getElementsByTagName( "i" );

while (
div.innerHTML = "<!--[if gt IE " + ( ++v ) + "]><i></i><![endif]-->",
all[ 0 ]
){}

return v > 4 ? v : undef;
}()),

// Lets load some variables into vapour for IE detection
other: !oldie,
desktop: ( window.orientation === undefined ),
ie: !!oldie,
ie6: ( oldie === 6 ),
ie7: ( oldie === 7 ),
ie8: ( oldie === 8 ),
ie9: ( oldie === 9 ),
ielt7: ( oldie < 7 ),
ielt8: ( oldie < 8 ),
ielt9: ( oldie < 9 ),
ielt10: ( oldie < 10 )
};
/*
* @variable currentpage
* @return {Object} of parts of the current page URL
*/
currentpage = getUrlParts( window.location.href ),

/*
* @variable disabled
* @return {boolean} of state of disabled flag
*/
disabled = (function() {
var disabled = currentpage.params.wbdisable,
toBoolean = function( sBoolean ) {
return ( /^true$/i ).test( sBoolean.toString() );
};

if ( disabled === undefined && localStorage && localStorage.getItem( "wbdisable" ) ) {
disabled = localStorage.getItem( "wbdisable" );
}
return toBoolean( disabled );
}()),

/*-----------------------------
* Vapour Core Object
*-----------------------------*/
vapour = {
"/": $homepath,
"/assets": "" + $homepath + "/assets",
"/templates": "" + $homepath + "/assets/templates",
"/deps": "" + $homepath + "/deps",
mode: $mode,
doc: $( document ),
win: $( window ),
html: $( "html" ),
sDisabled: "#wb-tphp",
pageUrlParts: currentpage,
getUrlParts: getUrlParts,
isDisabled : disabled,

getPath: function( property ) {
return this.hasOwnProperty( property ) ? this[ property ] : undef;
},

getMode: function() {
return this.mode;
},

// Lets load some variables into vapour for IE detection
other: !oldie,
desktop: ( window.orientation === undefined ),
ie: !!oldie,
ie6: ( oldie === 6 ),
ie7: ( oldie === 7 ),
ie8: ( oldie === 8 ),
ie9: ( oldie === 9 ),
ielt7: ( oldie < 7 ),
ielt8: ( oldie < 8 ),
ielt9: ( oldie < 9 ),
ielt10: ( oldie < 10 )
};

window.vapour = vapour;

/*-----------------------------
Yepnope Prefixes
----------------------------- */
* Yepnope Prefixes
*-----------------------------*/
/*
* Establish the base path to be more flexible in terms of WCMS where JS can reside in theme folders and not in the root of sites
* @TODO: For modularity the prefixes where written independently as we are flushing out some use cases on better grouping and optimization of polyfills.
* Once this more hashed out, we could optimize the prefixes down to one or two prefixes "site" and "disabled" to thin out the codeblock a bit more
* increase performance due to redundant chaining of the prefixes.
*/
* Establish the base path to be more flexible in terms of WCMS where JS can reside in theme folders and not in the root of sites
* @TODO: For modularity the prefixes where written independently as we are flushing out some use cases on better grouping and optimization of polyfills.
* Once this more hashed out, we could optimize the prefixes down to one or two prefixes "site" and "disabled" to thin out the codeblock a bit more
* increase performance due to redundant chaining of the prefixes.
*/

/*
@prefix: site! - adds the root js directory of yepnope resources
*/
* @prefix: site! - adds the root js directory of yepnope resources
*/
yepnope.addPrefix( "site", function( resourceObj ) {
resourceObj.url = $homepath + "/" + resourceObj.url;
return resourceObj;
});

/*
@prefix: i18n! - adds the correct document langugage for our i18n library
*/
* @prefix: i18n! - adds the correct document langugage for our i18n library
*/
yepnope.addPrefix( "i18n", function( resourceObj ) {
resourceObj.url = resourceObj.url + i18n + $mode + ".js";
return resourceObj;
});

/*
@prefix: modejs! - adds the correct document langugage for our i18n library
*/
* @prefix: modejs! - adds the correct document langugage for our i18n library
*/
yepnope.addPrefix( "modejs", function( resourceObj ) {
if ( !$mode ) {
resourceObj.url = resourceObj.url.replace(".min","");
resourceObj.url = resourceObj.url.replace( ".min", "" );
}
return resourceObj;
});

/*
@prefix: disabled! - checks if the user has disabled settings and bypassed the resource
*/
* @prefix: disabled! - checks if the user has disabled settings and bypassed the resource
*/
yepnope.addPrefix( "disabled", function( resourceObj ) {
if ( disabled ) {
resourceObj.bypass = true;
Expand All @@ -204,13 +204,13 @@ yepnope.addPrefix( "disabled", function( resourceObj ) {
});

/*-----------------------------
Base Timer
----------------------------- */

* Base Timer
*-----------------------------*/
window._timer = {
_elms: [],

add: function( _selector ) {

// lets ensure we are not running if things are disabled
if ( vapour.isDisabled && _selector !== vapour.sDisabled ) {
return 0;
Expand All @@ -224,9 +224,8 @@ window._timer = {

remove: function( _selector ) {
var elms = this._elms,
$elm,
len = elms.length,
i;
$elm, i;
for ( i = 0; i !== len; i += 1 ) {
$elm = elms[ i ];
if ( $elm && $elm.selector === _selector ) {
Expand Down Expand Up @@ -254,9 +253,8 @@ window._timer = {
touch: function() {

var elms = this._elms,
$elm,
len = elms.length,
i;
$elm, i;
for ( i = 0; i !== len; i += 1 ) {
$elm = elms[ i ];
if ( $elm ) {
Expand All @@ -268,13 +266,12 @@ window._timer = {
};

/*-----------------------------
Modernizr Polyfill Loading
----------------------------- */

* Modernizr Polyfill Loading
*-----------------------------*/
window.Modernizr.load([
{
load: "site!i18n!modejs!i18n/"
},{
}, {
test: Modernizr.canvas,
nope: "disabled!site!modejs!polyfills/excanvas.min.js"
}, {
Expand Down

0 comments on commit 4696465

Please sign in to comment.