From 4f04bd82a6a9569af11dce55c6cf666dfe02956c Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Fri, 28 Mar 2014 15:35:07 -0400
Subject: [PATCH] some fixes

---
 public/src/modules/composer.js | 9 +++------
 public/src/templates.js        | 9 ++++++---
 public/src/widgets.js          | 2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index fed554b9df..dc2e34925d 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -498,12 +498,9 @@ define(['taskbar'], function(taskbar) {
 	};
 
 	composer.createNewComposer = function(post_uuid) {
-
-		templates.preload_template('composer', function() {
-			var composerTemplate = templates.composer.parse({
-				allowTopicsThumbnail: config.allowTopicsThumbnail && composer.posts[post_uuid].isMain && (config.hasImageUploadPlugin || config.allowFileUploads)
-			});
-
+		var allowTopicsThumbnail = config.allowTopicsThumbnail && composer.posts[post_uuid].isMain && (config.hasImageUploadPlugin || config.allowFileUploads);
+		
+		templates.parse('composer', {allowTopicsThumbnail: allowTopicsThumbnail}, function(composerTemplate) {
 			translator.translate(composerTemplate, function(composerTemplate) {
 				composerTemplate = $(composerTemplate);
 
diff --git a/public/src/templates.js b/public/src/templates.js
index 30ab7380cf..02fabee079 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -52,7 +52,7 @@
 	};
 
 	templates.getBlock = function(template, block) {
-		return template.replace(new RegExp("[\\s\\S]*<!--[\\s]*BEGIN " + block + "[\\s]*-->[\r\n]*([\\s\\S]*?)[\r\n]*<!--[\\s]*END " + block + "[\\s]*-->[\\s\\S]*", 'g'), '$1');
+		return template.replace(new RegExp("[\\s\\S]*(<!--[\\s]*BEGIN " + block + "[\\s]*-->[\r\n]*[\\s\\S]*?[\r\n]*<!--[\\s]*END " + block + "[\\s]*-->)[\\s\\S]*", 'g'), '$1');
 	};
 
 	function express(filename, options, fn) {
@@ -151,7 +151,9 @@
 		template = checkConditional(template, '!' + namespace + 'length', !array[key].length);
 
 		var regex = makeRegex(key),
-			block = templates.getBlock(template, namespace.substring(0, namespace.length - 1));
+			block = namespace.substring(0, namespace.length - 1).split('.').pop();
+		
+		block = template.replace(new RegExp("[\\s\\S]*<!--[\\s]*BEGIN " + block + "[\\s]*-->[\r\n]*([\\s\\S]*?)[\r\n]*<!--[\\s]*END " + block + "[\\s]*-->[\\s\\S]*", 'g'), '$1');
 
 		if (typeof block === "undefined") {
 			return template;
@@ -253,7 +255,7 @@
 					continue;
 				} else if (obj[key] === null) {
 					template = replace(template, namespace + key, '');
-				} else if (obj[key].constructor === Array) {
+				} else if (obj[key].constructor === Array && obj[key].length) {
 					template = parseArray(template, obj, key, namespace + key + '.', bind);
 				} else if (obj[key] instanceof Object) {
 					defineParent(obj[key], originalObj);
@@ -281,6 +283,7 @@
 			// clean up all undefined conditionals
 			template = setBindContainer(template.replace(/\s*<!-- ELSE -->\s*/gi, 'ENDIF -->\r\n')
 								.replace(/\s*<!-- IF([\s\S]*?)ENDIF([\s\S]*?)-->/gi, '')
+								.replace(/\s*<!-- BEGIN([\s\S]*?)END([\s\S]*?)-->/gi, '')
 								.replace(/\s*<!-- ENDIF ([\s\S]*?)-->\s*/gi, ''), bind);
 
 			template = setBindContainer(template, bind);
diff --git a/public/src/widgets.js b/public/src/widgets.js
index 1764fed843..03ff844287 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -2,6 +2,8 @@
 /*global ajaxify, socket, templates*/
 
 (function(ajaxify) {
+	ajaxify.widgets = {};
+	
 	ajaxify.widgets.reposition = function() {
 		$('body [no-widget-class]').each(function() {
 			var $this = $(this);