spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/application/js/add_home_dialogue.js

@@ -1,5 +1,5 @@
 
-Spontaneous.AddHomeDialogue = (function($, S) {
+Spontaneous.AddHomeDialogue = (function($, S, window) {
 	var dom = S.Dom, Dialogue = Spontaneous.Dialogue;
 
 	var AddHomeDialogue = new JS.Class(Dialogue, {
@@ -7,14 +7,14 @@ Spontaneous.AddHomeDialogue = (function($, S) {
 			this.types = types;
 		},
 		title: function() {
-			return "Create site home page";
+			return 'Create site home page';
 		},
 		width: function() {
 			return '50%';
 		},
 		buttons: function() {
 			var btns = {};
-			btns["Create"] = this.create_home.bind(this);
+			btns['Create'] = this.create_home.bind(this);
 			return btns;
 		},
 
@@ -27,7 +27,7 @@ Spontaneous.AddHomeDialogue = (function($, S) {
 			}
 		},
 		home_created: function(data) {
-			window.location.href = S.Ajax.namespace
+			window.location.href = S.Ajax.namespace;
 		},
 		select_type: function(type) {
 			this.type = type;
@@ -35,25 +35,25 @@ Spontaneous.AddHomeDialogue = (function($, S) {
 		body: function() {
 			var editing = dom.div('#create-home-dialogue'), outer = dom.div(), instructions = dom.p('.instructions'),
 				types = this.types, __dialogue = this;
-			instructions.html("You don't have a home page. Please choose a type below and hit <span class=\"button\">Create</span> to add one")
+			instructions.html("You don't have a home page. Please choose a type below and hit <span class=\"button\">Create</span> to add one");
 			$.each(types, function(i, type) {
 				if (type.is_page()) {
 					var d = dom.div('.type').text(type.title).click(function() {
 						$('.type', outer).removeClass('selected');
 						__dialogue.select_type(type);
-						$(this).addClass('selected');;
+						$(this).addClass('selected');
 					});
-					outer.append(d)
+					outer.append(d);
 				}
 			});
-			editing.append(instructions, outer)
+			editing.append(instructions, outer);
 			return editing;
 		},
 		cancel_button: function() {
 			return false;
-		},
+		}
 	});
 	return AddHomeDialogue;
-})(jQuery, Spontaneous);
+})(jQuery, Spontaneous, window);
 
 

data/application/js/ajax.js

@@ -1,7 +1,7 @@
 // console.log("Loading Ajax...");
 
 Spontaneous.Ajax = (function($, S) {
-	"use strict";
+	'use strict';
 
 	$.ajaxSetup({
 		'async': true,
@@ -19,18 +19,18 @@ Spontaneous.Ajax = (function($, S) {
 	// wraps jQuery.ajax with a auth aware error catcher
 	var __request = function(params) {
 		// console.log("AJAX", params)
-		var requestSuccessHandler = params["success"];
+		var requestSuccessHandler = params.success;
 		var successHandler = function(data, textStatus, xhr) {
-			if (textStatus === "success") {
+			if (textStatus === 'success') {
 				if (params.ifModified) {
 					requestCache[params.url] = data;
 				}
-			} else if (!data && (textStatus === "notmodified")) {
+			} else if (!data && (textStatus === 'notmodified')) {
 				data = requestCache[params.url];
 			}
-			requestSuccessHandler(data, textStatus, xhr)
+			requestSuccessHandler(data, textStatus, xhr);
 		};
-		var requestErrorHandler = params["error"];
+		var requestErrorHandler = params.error;
 		var errorHandler = function(xhr, textStatus, error_thrown) {
 			if (xhr.status === 401) {
 				S.Ajax.unauthorized();
@@ -38,15 +38,15 @@ Spontaneous.Ajax = (function($, S) {
 				requestErrorHandler(xhr, textStatus, error_thrown);
 			}
 		};
-		params['error'] = errorHandler;
-		params['success'] = successHandler;
-		params['beforeSend'] = function (request) {
+		params.error = errorHandler;
+		params.success = successHandler;
+		params.beforeSend = function(request) {
 			__authenticate(request);
 		};
 		$.ajax(params);
 	};
 	return {
-		namespace: "/@spontaneous",
+		namespace: '/@spontaneous',
 		// returns a modified xmlhttprequest that adds csrf headers
 		// after #open is called.
 		authenticatedRequest: function(request) {
@@ -62,27 +62,27 @@ Spontaneous.Ajax = (function($, S) {
 			__authenticate(request);
 		},
 		get: function(url, data, callback, options) {
-			if (typeof data === "function") {
+			if (typeof data === 'function') {
 				callback = data;
 				data = {};
 			}
-			this.makeRequest("GET", url, data, callback, options)
+			this.makeRequest('GET', url, data, callback, options);
 		},
 		put: function(url, data, callback) {
-			this.makeRequest("PUT", url, data, callback);
+			this.makeRequest('PUT', url, data, callback);
 		},
 		del: function(url, data, callback) {
-			this.makeRequest("DELETE", url, data, callback);
+			this.makeRequest('DELETE', url, data, callback);
 		},
 		post: function(url, data, callback) {
-			this.makeRequest("POST", url, data, callback);
+			this.makeRequest('POST', url, data, callback);
 		},
 		patch: function(url, data, callback) {
-			this.makeRequest("PATCH", url, data, callback);
+			this.makeRequest('PATCH', url, data, callback);
 		},
 		makeRequest: function(method, url, data, callback, options) {
 			var success = function(data, textStatus, xhr) {
-				if (typeof callback === "function") {
+				if (typeof callback === 'function') {
 					callback(data, textStatus, xhr);
 				}
 			};
@@ -91,7 +91,7 @@ Spontaneous.Ajax = (function($, S) {
 				try {
 					result = $.parseJSON(xhr.responseText);
 				} catch (e) { }
-				if (typeof callback === "function") {
+				if (typeof callback === 'function') {
 					callback(result, textStatus, xhr);
 				}
 			};
@@ -106,12 +106,12 @@ Spontaneous.Ajax = (function($, S) {
 			__request(ajaxOptions);
 		},
 		unauthorized: function() {
-			window.location.href = "/";
+			window.location.href = '/';
 		},
 		test_field_versions: function(target, fields, success, failure) {
 			var version_data = {}, modified = 0;
 			for (var i = 0, ii = fields.length; i < ii; i++) {
-				var field = fields[i], key = "[fields]["+field.schema_id()+"]";
+				var field = fields[i], key = '[fields]['+field.schema_id()+']';
 				if (field.is_modified()) {
 					version_data[key] = field.version();
 					modified++;
@@ -138,26 +138,26 @@ Spontaneous.Ajax = (function($, S) {
 									version: values[0],
 									values: {
 										server_original: values[1],
-										local_edited:  field.edited_value(),
-										local_original:  field.original_value()
+										local_edited: field.edited_value(),
+										local_original: field.original_value()
 									}
 								});
 							}
 						}
-						failure(conflicted_fields)
+						failure(conflicted_fields);
 					}
 				}
 			});
 		},
 		csrf_token: function() {
-			return {'__token':csrfToken }
+			return {'__token':csrfToken };
 		},
 		request_url: function(url, needs_key) {
 			var path = this.namespace + url;
 			if (needs_key) {
-				path += "?"+$.param(this.csrf_token())
+				path += '?'+$.param(this.csrf_token());
 			}
-			return path
+			return path;
 		}
 	};
 }(jQuery, Spontaneous));

data/application/js/authentication.js

@@ -4,7 +4,7 @@ Spontaneous.Auth = (function($, S) {
 	return {
 		Key: {
 			key: function(site) {
-				return site + '_api_key'
+				return site + '_api_key';
 			},
 			save: function(site, key) {
 				localStorage.setItem(this.key(site), key);
@@ -14,7 +14,7 @@ Spontaneous.Auth = (function($, S) {
 			},
 			loadAutoLogin: function() {
 				if (!this._autoLoginKey) {
-					console.warn("Using auto login key for user", "'"+S.auto_login+"'");
+					console.warn('Using auto login key for user', "'"+S.auto_login+"'");
 					this._autoLoginKey = S.user_key;
 				}
 				return this._autoLoginKey;

data/application/js/box.js

@@ -22,13 +22,13 @@ Spontaneous.Box = (function($, S) {
 
 		type: function() {
 			if (!this._type) {
-				this._type = this.container.type().box_prototype(this.content.id)
+				this._type = this.container.type().box_prototype(this.content.id);
 			}
 			return this._type;
 		},
 
 		id: function() {
-			return this.container.id() + "/" + this.schema_id();
+			return this.container.id() + '/' + this.schema_id();
 		},
 
 		schema_id: function() {
@@ -39,10 +39,14 @@ Spontaneous.Box = (function($, S) {
 			return 'box';
 		},
 
+		isWritable: function() {
+			return this.type().data.writable;
+		},
+
 		mouseover: function() {
 			if (this.fields_preview) {
 				this.fields_preview.addClass('hover');
-			};
+			}
 		},
 		mouseout: function() {
 			if (this.fields_preview) {
@@ -57,11 +61,11 @@ Spontaneous.Box = (function($, S) {
 			}
 			var id = css_id.split('-')[1], entry;
 
-			for (var i = 0, entries = this.entries(), ii = entries.length; i < ii; i++) {
+			for (i = 0, entries = this.entries(), ii = entries.length; i < ii; i++) {
 				if (entries[i].id() == id) { entry = entries[i]; break; }
 			}
 			entry.reposition(position, function(entry) {
-				this.sorted(entry)
+				this.sorted(entry);
 			}.bind(this));
 		},
 		sorted: function(entry) {
@@ -73,7 +77,7 @@ Spontaneous.Box = (function($, S) {
 		},
 
 		entry_id: function(entry) {
-			return "entry-" + entry.id();
+			return 'entry-' + entry.id();
 		},
 
 		entry_class: function() {
@@ -84,13 +88,20 @@ Spontaneous.Box = (function($, S) {
 			Spontaneous.Ajax.post(['/content', this.id(), type.schema_id].join('/'), {position: position}, this.entry_added.bind(this));
 		},
 
-		add_alias: function(alias_target_id, type, position) {
-			S.Ajax.post(["/alias", this.id()].join("/"), {'alias_id':type.schema_id, 'target_id':alias_target_id, 'position':position}, this.entry_added.bind(this));
+		add_alias: function(alias_target_ids, type, position) {
+			S.Ajax.post(['/alias', this.id()].join('/'), {'alias_id':type.schema_id, 'target_ids':alias_target_ids, 'position':position}, this.entries_added.bind(this));
+		},
+
+		entries_added: function(result) {
+			var self = this;
+			result.forEach(function(entry) {
+				self.entry_added(entry);
+			});
 		},
 
 		entry_added: function(result) {
 			var box = this
-			,position = result.position
+			, position = result.position
 			, e = result.entry
 			, entry = this.wrap_entry(e);
 
@@ -125,7 +136,7 @@ Spontaneous.Box = (function($, S) {
 		// 	return [this.id()].join('/');
 		// },
 		entry_wrappers: function() {
-			return this._entry_container.find('> .'+this.entry_class())
+			return this._entry_container.find('> .'+this.entry_class());
 		}
 	});
 

data/application/js/box_container.js

@@ -21,18 +21,21 @@ Spontaneous.BoxContainer = (function($, S) {
 			return wrapper;
 		},
 		tab_bar: function() {
+			var self = this;
 			if (this.boxes().length === 0) { return ''; }
 			if (!this._tab_bar) {
 				var bar = dom.ul('.slot-tabs');
+				var clickFunction = function(i) {
+					return function() {
+						this.activate(i, true);
+					}.bind(self);
+				};
 				for (var i = 0, boxes = this.boxes(), ii = boxes.length; i < ii; i++) {
 					var box = boxes[i];
 					var li = dom.li();
-					li.text(box.name())
+					li.text(box.name());
 					li.append(dom.span('.down'));
-					var click = function(index) {
-						this.activate(index, true);
-					}.bind(this, i);
-					li.click(click);
+					li.click(clickFunction(i));
 					bar.append(li);
 				}
 				this._tab_bar = bar;
@@ -43,7 +46,7 @@ Spontaneous.BoxContainer = (function($, S) {
 			var box = this.boxes()[box_index];
 			if (box === this._active_box) { return; }
 			$('li', this.tab_bar()).removeClass('active');
-			$('li:nth-child('+(box_index+1)+')', this.tab_bar()).addClass('active')
+			$('li:nth-child('+(box_index+1)+')', this.tab_bar()).addClass('active');
 			box.activate();
 			this._active_box = box;
 			if (manually) {
@@ -65,10 +68,13 @@ Spontaneous.BoxContainer = (function($, S) {
 			this.activate(0);
 		},
 		boxes: function() {
+			var self = this;
 			if (!this._boxes) {
 				var _boxes = [], content_container = this.box_content_container;
 				var f = function(i, box) {
-					_boxes.push(new Spontaneous.Views.BoxView(box, content_container))
+					var view = new Spontaneous.Views.BoxView(box, content_container);
+					self._subviews.push(view);
+					_boxes.push(view);
 				}.bind(this);
 				$.each(this.content.boxes(), f);
 				this._boxes = _boxes;

data/application/js/compatibility.js

@@ -12,20 +12,22 @@
 // 2. Regularise access to the various APIs, removing vendor prefixes and providing the spec defined methods
 // 3. Add some useful CSS-visible attributes to the HTML element
 (function() {
+	'use strict';
 	var _window = window, _document = document;
 	var testFlexBoxCompatibility = false;
+	var i, ii;
 	var prefixes = ' -webkit- -moz- -o- -ms- -khtml- '.split(' ');
 	try {
 
 		///////////////////////////// Flexible Box model
-		function set_prefixed_property_css(element, property, value, extra) {
+		var set_prefixed_property_css = function(element, property, value, extra) {
 			element.style.cssText = prefixes.join(property + ':' + value + ';') + (extra || '');
-		}
+		};
 
-		function set_prefixed_value_css(element, property, value, extra) {
+		var set_prefixed_value_css = function(element, property, value, extra) {
 			property += ':';
 			element.style.cssText = (property + prefixes.join(value + ';' + property)).slice(0, -property.length) + (extra || '');
-		}
+		};
 
 
 		if (testFlexBoxCompatibility) {
@@ -39,32 +41,32 @@
 
 			c.appendChild(elem);
 			docElement.appendChild(c);
-			w = elem.offsetWidth
+			w = elem.offsetWidth;
 			c.removeChild(elem);
 			docElement.removeChild(c);
 
 			if (w !== 42) {
 				// console.error(w)
-				throw (w) + " Flexible Box Model not supported"
+				throw (w) + ' Flexible Box Model not supported';
 			}
 		}
 
 		///////////////////////////// XHR Uploads
 		var xhr = new XMLHttpRequest();
 		if (!xhr.upload) {
-			throw "XMLHttpRequestUpload not supported";
+			throw 'XMLHttpRequestUpload not supported';
 		}
 
 		///////////////////////////// FormData
 		try {
 			var f = new FormData();
 		} catch (e) {
-			throw "FormData not supported";
+			throw 'FormData not supported';
 		}
 
 		///////////////////////////// File API / File objects
 		if (!_window.File) {
-			throw "File API not supported";
+			throw 'File API not supported';
 		}
 
 		///////////////////////////// File API / objectURLs
@@ -89,7 +91,7 @@
 					//// would seriously limit users ability to make quick changes on the go, for instance)
 					_window.URL[createObjectURL] = function(file) {
 						return '';
-					}
+					};
 					// throw "File API not supported";
 				}
 				if (_window.revokeBlobURL) {
@@ -106,7 +108,7 @@
 					//// would seriously limit users ability to make quick changes on the go, for instance)
 					_window.URL[revokeObjectURL] = function(file) {
 						return '';
-					}
+					};
 					// throw "File API not supported";
 				}
 			}
@@ -116,7 +118,7 @@
 		var proto = _window.File.prototype;
 		if (!proto.slice) {
 			var methods = ['webkitSlice', 'mozSlice'];
-			for (var i = 0, ii = methods.length; i < ii; i++) {
+			for (i = 0, ii = methods.length; i < ii; i++) {
 				var method = methods[i];
 				if (proto[method]) { proto.slice = proto[method]; }
 			}
@@ -129,15 +131,15 @@
 
 		///////////////////////////// localStorage
 		try {
-			var i = localStorage.getItem;
+			i = localStorage.getItem;
 		} catch(e) {
-			throw "Local Storage not supported"
+			throw 'Local Storage not supported';
 		}
 
 		var b = _document.documentElement;
-		b.setAttribute('data-useragent',  navigator.userAgent);
-		b.setAttribute('data-platform', navigator.platform );
+		b.setAttribute('data-useragent', navigator.userAgent);
+		b.setAttribute('data-platform', navigator.platform);
 	} catch (e) {
-		_window.location.href = "/@spontaneous/unsupported?msg=" + _window.encodeURIComponent(e) + "&useragent=" + _window.encodeURIComponent(_window.navigator.userAgent);
+		_window.location.href = '/@spontaneous/unsupported?msg=' + _window.encodeURIComponent(e) + '&useragent=' + _window.encodeURIComponent(_window.navigator.userAgent);
 	}
 }());