Merge branch 'refs/heads/develop' into redesign

Conflicts: couchpotato/static/scripts/couchpotato.js
2014-05-11 20:25:15 +02:00
parent 05a97a19ab 1ac01456a9
commit 58acd53a9a
65 changed files with 1204 additions and 388 deletions
@@ -1,4 +1,4 @@
-var CouchPotato = new Class({
+var CouchPotato = new Class({

 	Implements: [Events, Options],

@@ -137,19 +137,34 @@
 	createPages: function(){
 		var self = this;

+		var pages = [];
 		Object.each(Page, function(page_class, class_name){
 			var pg = new Page[class_name](self, {});
 			self.pages[class_name] = pg;

-			self.fireEvent('load'+class_name);
-
-			$(pg).inject(self.pages);
+			pages.include({
+				'order': pg.order,
+				'name': class_name,
+				'class': pg
+			});
 		});

+		pages.stableSort(self.sortPageByOrder).each(function(page){
+			page['class'].load();
+			self.fireEvent('load'+page.name);
+			$(page['class']).inject(self.content);
+		});
+
+		delete pages;
+
 		self.fireEvent('load');

 	},

+	sortPageByOrder: function(a, b){
+		return (a.order || 100) - (b.order || 100)
+	},
+
 	openPage: function(url) {
 		var self = this;