merge master into interface

1 files changed, 37 insertions, 3 deletions

diff --git a/core/js/js.js b/core/js/js.js
index 9a14cb8ed4f..9117f08349a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -18,6 +18,40 @@ function t(app,text){
 	}
 }
 
-$(document).ready(function(){
-	// Put fancy stuff in here
-});
+OC={
+	webroot:oc_webroot,
+	coreApps:['files','admin','log','search','settings'],
+	linkTo:function(app,file){
+		return OC.filePath(app,'',file);
+	},
+	filePath:function(app,type,file){
+		var isCore=OC.coreApps.indexOf(app)!=-1;
+		app+='/';
+		var link=OC.webroot+'/';
+		if(!isCore){
+			link+='apps/';
+		}
+		link+=app;
+		if(type){
+			link+=type+'/'
+		}
+		link+=file;
+		return link;
+	},
+	imagePath:function(app,file){
+		return OC.filePath(app,'img',file);
+	},
+	addScript:function(app,script,ready){
+		var path=OC.filePath(app,'js',script+'.js');
+		if(ready){
+			$.getScript(path,ready);
+		}else{
+			$.getScript(path);
+		}
+	},
+	addStyle:function(app,style){
+		var path=OC.filePath(app,'css',style+'.css');
+		var style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+		$('head').append(style);
+	}
+}