will now go back to scroll location if page gets reloaded

bliptec · bliptec · commit 655ee8970e8a · 2014-05-22T17:37:23.000-04:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -156,3 +156,4 @@ module.exports = function(grunt) {
 	]);
 
 };
+
diff --git a/app/index.html b/app/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en" manifest="manifest.appcache"><head><title>GLua Docs</title><meta charset="utf-8"><meta name="keywords" content="glua, lua, docs, documentation, gmod, garrys, garry, mod, wiki"><meta name="description" content="Quick documentation lookup for Garry's Mod Lua."><meta name="author" content="Samuel Maddock"><link rel="shortcut icon" href="favicon.png"><link rel="stylesheet" href="css/style.min.css"></head><body><div class="wrapper"><header><div class="title">GLua Docs</div><nav><ul><li><a href="http://github.com/samuelmaddock/glua-docs" target="_blank">GitHub</a></li><li><a href="http://github.com/samuelmaddock/glua-docs/issues" target="_blank">Bugs</a></li><li><a href="http://wiki.garrysmod.com/" target="_blank">Wiki</a></li></ul></nav></header><div class="site" ng-app="docsApp" ng-controller="DocsCtrl"><div class="wrapper"><div class="search-container"><div class="wrapper"><div class="search-header"><input type="search" placeholder="Type a hook or function name" ng-model="queryModel" ng-change="updateQuery()" spellcheck="false" autofocus=""></div><ul id="results" class="scroll"><div id="s_top"><li ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:query}" class="{{fn.scope}}"><a ng-show="$index < 30 && query" ng-click="select(fn, false)" href="#">{{fn.title}}</a> <a ng-show="$index > 29 || !query" ng-click="select(fn, true)" href="#">{{fn.title}}</a></li></ul></div></div><div class="doc-container"><div class="wrapper scroll" ng-show="query == ''"><div class="doc"><h1>Begin by typing in a function</h1><p>Functions are organized by&nbsp; <span class="server">Server</span>,&nbsp; <span class="shared">Shared</span>,&nbsp; <span class="client">Client</span>,&nbsp; and <span class="menu">Menu</span>&nbsp; Lua states.</p></div></div><div class="wrapper scroll" ng-show="query != ''"><div id="top"><article class="doc" ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:filter}|limitTo:30" doc-rainbow=""><div id="{{fn.title}}"><h1><a href="{{fn.url}}" class="{{fn.scope}}" target="_blank">{{fn.title}}</a> <a href="https://github.com/garrynewman/garrysmod/search?q={{fn.title}}" class="extra" target="_blank"><i class="icon-github"></i></a></h1><div class="title-links"></div><div class="wiki" ng-bind-html="unsafeHtml(fn.html)"></div></div></article></div></div></div></div></div><script src="js/lib/angular.min.js" type="text/javascript"></script><script src="js/gluadocs.min.js" type="text/javascript"></script><script async="" src="js/lib/rainbow-custom.min.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+<!DOCTYPE html><html lang="en" manifest="manifest.appcache"><head><title>GLua Docs</title><meta charset="utf-8"><meta name="keywords" content="glua, lua, docs, documentation, gmod, garrys, garry, mod, wiki"><meta name="description" content="Quick documentation lookup for Garry's Mod Lua."><meta name="author" content="Samuel Maddock"><link rel="shortcut icon" href="favicon.png"><link rel="stylesheet" href="css/style.min.css"></head><body><div class="wrapper"><header><div class="title">GLua Docs</div><nav><ul><li><a href="http://github.com/samuelmaddock/glua-docs" target="_blank">GitHub</a></li><li><a href="http://github.com/samuelmaddock/glua-docs/issues" target="_blank">Bugs</a></li><li><a href="http://wiki.garrysmod.com/" target="_blank">Wiki</a></li></ul></nav></header><div class="site" ng-app="docsApp" ng-controller="DocsCtrl"><div class="wrapper"><div class="search-container"><div class="wrapper"><div class="search-header"><input type="search" placeholder="Type a hook or function name" ng-model="queryModel" ng-change="updateQuery()" spellcheck="false" autofocus=""></div><ul id="results" class="scroll"><div id="s_top"><li ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:query}" class="{{fn.scope}}"><a ng-show="$index < 30 && queryModel" ng-click="select(fn, false)" href="" onclick="return false">{{fn.title}}</a> <a ng-show="$index > 29 || !queryModel" ng-click="select(fn, true)" href="" onclick="return false">{{fn.title}}</a></li></ul></div></div><div class="doc-container"><div class="wrapper scroll" ng-show="query == '' && filter == ''"><div class="doc"><h1>Begin by typing in a function</h1><p>Functions are organized by&nbsp; <span class="server">Server</span>,&nbsp; <span class="shared">Shared</span>,&nbsp; <span class="client">Client</span>,&nbsp; and <span class="menu">Menu</span>&nbsp; Lua states.</p></div></div><div class="wrapper scroll" ng-show="query != '' || filter != ''"><div id="top"><article class="doc" ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:filter}|limitTo:30" doc-rainbow=""><div id="{{fn.title}}"><h1><a href="{{fn.url}}" class="{{fn.scope}}" target="_blank">{{fn.title}}</a> <a href="https://github.com/garrynewman/garrysmod/search?q={{fn.title}}" class="extra" target="_blank"><i class="icon-github"></i></a></h1><div class="title-links"></div><div class="wiki" ng-bind-html="unsafeHtml(fn.html)"></div></div></article></div></div></div></div></div><script src="js/lib/angular.min.js" type="text/javascript"></script><script src="js/gluadocs.min.js" type="text/javascript"></script><script async="" src="js/lib/rainbow-custom.min.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
diff --git a/app/js/gluadocs.min.js b/app/js/gluadocs.min.js
diff --git a/app/manifest.appcache b/app/manifest.appcache
@@ -1,13 +1,12 @@
 CACHE MANIFEST
-# Time: Thu May 22 2014 16:29:00 GMT-0400 (EDT)
+# Time: Thu May 22 2014 17:34:25 GMT-0400 (EDT)
 
 CACHE:
 index.html
 data/glua.json
 css/style.min.css
 js/gluadocs.min.js
 js/lib/angular.min.js
-js/lib/angular-route.min.js
 js/lib/rainbow-custom.min.js
 font/Roboto-Regular-webfont.svg
 font/fontawesome-webfont.svg
diff --git a/src/index.html b/src/index.html
@@ -59,8 +59,8 @@
 						<ul id="results" class="scroll">
 							<div id="s_top"/>
 							<li ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:query}" class="{{fn.scope}}">
-								<a ng-show="$index < 30 && query" ng-click="select(fn, false)" href="#">{{fn.title}}</a>
-								<a ng-show="$index > 29 || !query" ng-click="select(fn, true)" href="#">{{fn.title}}</a>	
+								<a ng-show="$index < 30 && queryModel" ng-click="select(fn, false)" href="" onclick="return false;" >{{fn.title}}</a>
+								<a ng-show="$index > 29 || !queryModel" ng-click="select(fn, true)" href="" onclick="return false;" >{{fn.title}}</a>	
 							</li>
 						</ul>
 
@@ -70,7 +70,7 @@
 
 				<div class="doc-container">
 
-					<div class="wrapper scroll" ng-show="query == ''">
+					<div class="wrapper scroll" ng-show="query == '' && filter == ''">
 						<div class="doc">
 							<h1>Begin by typing in a function</h1>
 							<p>
@@ -84,7 +84,7 @@ <h1>Begin by typing in a function</h1>
 						</div>
 					</div>
 
-					<div class="wrapper scroll" ng-show="query != ''">
+					<div class="wrapper scroll" ng-show="query != '' || filter != ''">
 						<div id="top"/>
 
 						<article class="doc" ng-repeat="fn in functions|orderBy:scopedOrder|filter:{title:filter}|limitTo:30" doc-rainbow><div id="{{fn.title}}">
diff --git a/src/js/controllers.js b/src/js/controllers.js
@@ -31,6 +31,10 @@ angular.module('docsApp.controllers', []).
 			$anchorScroll();
 		}
 
+		window.setTimeout(function() {
+			$scope.scrollTo(window.location.hash.match(/#[a-zA-Z0-9_.-]*/g)[1].substr(1));
+		}, 200);
+
 		$scope.select = function(fn, pastLimit) {
 			if (pastLimit) {
 				$location.search('filter', fn.title);
@@ -40,7 +44,7 @@ angular.module('docsApp.controllers', []).
 				$scope.filter = $scope.query;
 				$scope.scrollTo(fn.title);
 			}
-			
+
 		}
 
 		$scope.updateQuery = function() {

Original file line number	Diff line number	Diff line change
`@@ -156,3 +156,4 @@ module.exports = function(grunt) {`
`156`	`156`	`]);`
`157`	`157`
`158`	`158`	`};`
	`159`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-<!DOCTYPE html><html lang="en" manifest="manifest.appcache"><head><title>GLua Docs</title><meta charset="utf-8"><meta name="keywords" content="glua, lua, docs, documentation, gmod, garrys, garry, mod, wiki"><meta name="description" content="Quick documentation lookup for Garry's Mod Lua."><meta name="author" content="Samuel Maddock"><link rel="shortcut icon" href="favicon.png"><link rel="stylesheet" href="css/style.min.css"></head><body><div class="wrapper"><header><div class="title">GLua Docs</div><nav><ul><li><a href="http://github.com/samuelmaddock/glua-docs" target="_blank">GitHub</a></li><li><a href="http://github.com/samuelmaddock/glua-docs/issues" target="_blank">Bugs</a></li><li><a href="http://wiki.garrysmod.com/" target="_blank">Wiki</a></li></ul></nav></header><div class="site" ng-app="docsApp" ng-controller="DocsCtrl"><div class="wrapper"><div class="search-container"><div class="wrapper"><div class="search-header"><input type="search" placeholder="Type a hook or function name" ng-model="queryModel" ng-change="updateQuery()" spellcheck="false" autofocus=""></div><ul id="results" class="scroll"><div id="s_top"><li ng-repeat="fn in functions\|orderBy:scopedOrder\|filter:{title:query}" class="{{fn.scope}}"><a ng-show="$index < 30 && query" ng-click="select(fn, false)" href="#">{{fn.title}}</a> <a ng-show="$index > 29 \|\| !query" ng-click="select(fn, true)" href="#">{{fn.title}}</a></li></ul></div></div><div class="doc-container"><div class="wrapper scroll" ng-show="query == ''"><div class="doc"><h1>Begin by typing in a function</h1><p>Functions are organized by  <span class="server">Server</span>,  <span class="shared">Shared</span>,  <span class="client">Client</span>,  and <span class="menu">Menu</span>  Lua states.</p></div></div><div class="wrapper scroll" ng-show="query != ''"><div id="top"><article class="doc" ng-repeat="fn in functions\|orderBy:scopedOrder\|filter:{title:filter}\|limitTo:30" doc-rainbow=""><div id="{{fn.title}}"><h1><a href="{{fn.url}}" class="{{fn.scope}}" target="_blank">{{fn.title}}</a> <a href="https://github.com/garrynewman/garrysmod/search?q={{fn.title}}" class="extra" target="_blank"><i class="icon-github"></i></a></h1><div class="title-links"></div><div class="wiki" ng-bind-html="unsafeHtml(fn.html)"></div></div></article></div></div></div></div></div><script src="js/lib/angular.min.js" type="text/javascript"></script><script src="js/gluadocs.min.js" type="text/javascript"></script><script async="" src="js/lib/rainbow-custom.min.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]\|\|function(){
	`1`	+<!DOCTYPE html><html lang="en" manifest="manifest.appcache"><head><title>GLua Docs</title><meta charset="utf-8"><meta name="keywords" content="glua, lua, docs, documentation, gmod, garrys, garry, mod, wiki"><meta name="description" content="Quick documentation lookup for Garry's Mod Lua."><meta name="author" content="Samuel Maddock"><link rel="shortcut icon" href="favicon.png"><link rel="stylesheet" href="css/style.min.css"></head><body><div class="wrapper"><header><div class="title">GLua Docs</div><nav><ul><li><a href="http://github.com/samuelmaddock/glua-docs" target="_blank">GitHub</a></li><li><a href="http://github.com/samuelmaddock/glua-docs/issues" target="_blank">Bugs</a></li><li><a href="http://wiki.garrysmod.com/" target="_blank">Wiki</a></li></ul></nav></header><div class="site" ng-app="docsApp" ng-controller="DocsCtrl"><div class="wrapper"><div class="search-container"><div class="wrapper"><div class="search-header"><input type="search" placeholder="Type a hook or function name" ng-model="queryModel" ng-change="updateQuery()" spellcheck="false" autofocus=""></div><ul id="results" class="scroll"><div id="s_top"><li ng-repeat="fn in functions\|orderBy:scopedOrder\|filter:{title:query}" class="{{fn.scope}}"><a ng-show="$index < 30 && queryModel" ng-click="select(fn, false)" href="" onclick="return false">{{fn.title}}</a> <a ng-show="$index > 29 \|\| !queryModel" ng-click="select(fn, true)" href="" onclick="return false">{{fn.title}}</a></li></ul></div></div><div class="doc-container"><div class="wrapper scroll" ng-show="query == '' && filter == ''"><div class="doc"><h1>Begin by typing in a function</h1><p>Functions are organized by  <span class="server">Server</span>,  <span class="shared">Shared</span>,  <span class="client">Client</span>,  and <span class="menu">Menu</span>  Lua states.</p></div></div><div class="wrapper scroll" ng-show="query != '' \|\| filter != ''"><div id="top"><article class="doc" ng-repeat="fn in functions\|orderBy:scopedOrder\|filter:{title:filter}\|limitTo:30" doc-rainbow=""><div id="{{fn.title}}"><h1><a href="{{fn.url}}" class="{{fn.scope}}" target="_blank">{{fn.title}}</a> <a href="https://github.com/garrynewman/garrysmod/search?q={{fn.title}}" class="extra" target="_blank"><i class="icon-github"></i></a></h1><div class="title-links"></div><div class="wiki" ng-bind-html="unsafeHtml(fn.html)"></div></div></article></div></div></div></div></div><script src="js/lib/angular.min.js" type="text/javascript"></script><script src="js/gluadocs.min.js" type="text/javascript"></script><script async="" src="js/lib/rainbow-custom.min.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]\|\|function(){
`2`	`2`	`(i[r].q=i[r].q\|\|[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),`
`3`	`3`	`m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)`
`4`	`4`	`})(window,document,'script','//www.google-analytics.com/analytics.js','ga');`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ angular.module('docsApp.controllers', []).`
`31`	`31`	`$anchorScroll();`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ window.setTimeout(function() {`
	`35`	`+ $scope.scrollTo(window.location.hash.match(/#[a-zA-Z0-9_.-]*/g)[1].substr(1));`
	`36`	`+ }, 200);`
	`37`	`+`
`34`	`38`	`$scope.select = function(fn, pastLimit) {`
`35`	`39`	`if (pastLimit) {`
`36`	`40`	`$location.search('filter', fn.title);`
`@@ -40,7 +44,7 @@ angular.module('docsApp.controllers', []).`
`40`	`44`	`$scope.filter = $scope.query;`
`41`	`45`	`$scope.scrollTo(fn.title);`
`42`	`46`	`}`
`43`		`-`
	`47`	`+`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`$scope.updateQuery = function() {`