moved app version to app.html

public/html/app.html

@@ -7,7 +7,9 @@
 	<link rel="icon" href="app/images/favicon.ico" type="image/x-icon">
 	<script type="text/javascript" src="lib/js/lib/jquery/jquery.min.js"></script>
 	<script type="text/javascript">
+	window._version_number = "%(_version_number)s";
 	// browser support
+
 	if(($.browser.mozilla && parseFloat($.browser.version)<4) ||
 		($.browser.msie && parseFloat($.browser.version)<9) ||
 		($.browser.webkit && parseFloat($.browser.version)<533) ) {

public/js/core.js

@@ -30,9 +30,6 @@ if(!console) {
 	}
 }
 
-// this will be set during build
-window._version_number = "%(_version_number)s";
-
 /* start the application */
 $(document).ready(function() {
 	wn.assets.check();

public/js/wn/assets.js

@@ -48,6 +48,7 @@ wn.assets = {
 		if(window._version_number != localStorage.getItem("_version_number")) {
 			localStorage.clear();
 			localStorage.setItem("_version_number", window._version_number)
+			console.log("Cleared App Cache.");
 		}
 	},
 	

webnotes/install_lib/setup_public_folder.py

@@ -19,7 +19,6 @@ def make():
 		["lib", "../lib/public"],
 		["web.py", "../lib/public/html/web.py"],
 		["server.py", "../lib/public/html/server.py"],
-		["app.html", "../lib/public/html/app.html"],
 		["blank.html", "../lib/public/html/blank.html"],
 		["unsupported.html", "../lib/public/html/unsupported.html"],
 		["sitemap.xml", "../lib/public/html/sitemap.xml"],

webnotes/utils/bundlejs.py

@@ -59,11 +59,6 @@ class Bundle:
 
 				data = infile.read()
 
-				if os.path.basename(f)=='core.js':
-					import webnotes
-					data = data % {"_version_number": webnotes.generate_hash() }
-
-
 			outtxt += ('\n/*\n *\t%s\n */' % f)
 					
 			# append
@@ -114,6 +109,20 @@ class Bundle:
 			
 			self.concat(infiles, os.path.relpath(os.path.join(self.path, outfile), os.curdir))						
 	
+		self.reset_app_html()
+		
+	def reset_app_html(self):
+		import webnotes
+
+		if os.path.exists("public/app.html"):
+			os.remove("public/app.html")
+					
+		with open('lib/public/html/app.html', 'r') as app_html:
+			data = app_html.read()
+			data = data % {"_version_number": webnotes.generate_hash() }
+			with open('public/app.html', 'w') as new_app_html:
+				new_app_html.write(data)
+	
 	def get_infiles(self, builddict):
 		"""make list of files to merge"""
 		outfile = builddict.keys()[0]