Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge conflicts resolved...

  • Loading branch information...
commit a88b07ed71a911fd906a13c229f13d9e8e0fdb07 2 parents 45c1e07 + d31e478
@cousinwil authored
View
10 README
@@ -35,8 +35,14 @@ Project Info:
base.html - base elements of a modern front end HTML5 template
- I will be adding line by line documentation shortly. Wonder why something is
- here? There it will be... eventually.
+ Documentation:
+ base.html
+ - St.eeze/base.html lines 1-7 (https://gist.github.com/1213174)
+ - St.eeze/base.html lines 8-22 (https://gist.github.com/1213183)
+ - St.eeze/base.html lines 24-34 (https://gist.github.com/1213325)
+ - St.eeze/base.html lines 38-62 (https://gist.github.com/1213350)
+
+ More to come...
Licensed Components:
View
22 base.html
@@ -26,10 +26,9 @@
<link rel="shortcut icon" href=""/>
<link rel="apple-touch-icon" href=""/>
- <!--[if lte IE 8]>
+ <!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
- <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE8.js"></script>
- <![endif]-->
+ <![endif]-->
</head>
<body>
@@ -41,16 +40,19 @@
<script type="text/javascript">
(function($) {
$(document).ready(function{
- base.init.home.ready('See line 55 of base.html to trace this call.');
+ base.inits.main.ready('See line 43 of base.html to trace this call.');
});
$(window).load(function(){
- setTimeout(function(){ /* ensures it loads **after** the loading spinner stops */
- base.init.home.load('See line 59 of base.html to trace this call.');
+ setTimeout(function(){ /* minimal timeout ensures things load **after** the browser spinner stops */
+ base.inits.main.load('See line 47 of base.html to trace this call.');
+ $(window).resize(function(){ /* when the window is scaled by the user - absolute element redraws */
+ base.inits.main.size('See line 50 of base.html to trace this call.');
+ });
+ $(window).scroll(function(){ /* when the window is scrolled by the user - absolute element redraws */
+ base.inits.main.scroll('See line 52 of base.html to trace this call.');
+ });
}, 15);
- });
- $(window).resize(function(){ /* when the window is scaled y the user - absolute element redraws */
- base.init.home.size('See line 63 of base.html to trace this call.');
- });
+ });
})(jQuery);
</script>
View
46 base/base.js
@@ -6,24 +6,7 @@
var base = {
- /* Google
-
- base.google.visit - allows us to connect to your Google Analytics acct and
- track visits which occur w/o page load. Track things
- like which button was clicked, etc using some url
- hackery
-
- base.google.font - downloads webfonts from google
-
- --------------------------------------------------------------------------- */
- google: {
- visit: function(tracked){
- console.log('Tracked: ' + tracked);
- pageTracker._trackPageview(tracked);
- } // end base.google.track
- }, // end base.google
-
- init: {
+ inits: {
/* INITs for each controller, view, just as needed...
These allow you to load up event handlers and functions specific to
@@ -34,26 +17,21 @@ var base = {
redrawing absolute elements, etc.)
--------------------------------------------------------------------------- */
- home: {
+ main: {
ready: function(info){
-
- // see www.google.com/webfonts for fonts. I prefer to load these on load
- console.log('steeze is inside base.init.home.ready. MSG: '+info);
-
- }, // end base.init.sample
-
+ console.log('steeze is inside base.inits.main.ready() MSG: '+info);
+ }, // end base.init.main.ready
load: function(info){
-
- // see www.google.com/webfonts for fonts. I prefer to loading these here
- console.log('steeze is inside base.init.load.ready. MSG: '+info);
-
- }, // end base.init.home.init.load
-
+ console.log('steeze is inside base.inits.main.load() MSG: '+info);
+ }, // end base.init.main.load
size: function(info){
- console.log('steeze is inside st.init.size.ready. MSG: '+info);
-
- } // end base.init.home.resize
+ console.log('steeze is inside base.inits.main.size() MSG: '+info);
+ }, // end base.init.main.size
+ scroll: function(info){
+ console.log('steeze is inside base.inits.main.scroll() MSG: '+info);
+ } // end base.init.main.size
+
}
} // end base.init
View
6 rails_base/app/views/layouts/base.html.erb
@@ -40,15 +40,15 @@
<script type="text/javascript">
(function($) {
$(document).ready(function{
- base.init.home.ready('See line 55 of base.html to trace this call.');
+ base.init.home.ready('See line 43 of base.html.erb to trace this call.');
});
$(window).load(function(){
setTimeout(function(){ /* ensures it loads **after** the loading spinner stops */
- base.init.home.load('See line 59 of base.html to trace this call.');
+ base.init.home.load('See line 47 of base.html.erb to trace this call.');
}, 15);
});
$(window).resize(function(){ /* when the window is scaled y the user - absolute element redraws */
- base.init.home.size('See line 63 of base.html to trace this call.');
+ base.init.home.size('See line 52 of base.html.erb to trace this call.');
});
})(jQuery);
</script>
Please sign in to comment.
Something went wrong with that request. Please try again.