spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/application/js/edit_panel.js

@@ -8,7 +8,7 @@ Spontaneous.EditPanel = (function($, S) {
 			this.parent_view = parent_view;
 		},
 		buttons: function() {
-			var save_label = "Save (" + ((window.navigator.platform.indexOf("Mac") === 0) ? "Cmd" : "Ctrl") + "+s)", btns = {};
+			var save_label = 'Save (' + ((window.navigator.platform.indexOf('Mac') === 0) ? 'Cmd' : 'Ctrl') + '+s)', btns = {};
 			btns[save_label] = this.save.bind(this);
 			return btns;
 		},
@@ -41,7 +41,7 @@ Spontaneous.EditPanel = (function($, S) {
 				field_data.append(v.name, v.value);
 				size += (v.name.length + v.value.length);
 			});
-			$('> *', this.form).animate({'opacity': 0.3}, 400);
+			$('> *', this.form).velocity({'opacity': 0.3}, 400);
 			if (values.length > 0) {
 				Spontaneous.UploadManager.form(this, field_data, size);
 			} else {
@@ -78,13 +78,14 @@ Spontaneous.EditPanel = (function($, S) {
 
 		conflicts_resolved: function(conflict_list) {
 			// console.log('conflicts resolved', conflict_list)
-			var ff = this.parent_view.field_list(), conflicts = {};
+			var ff = this.parent_view.field_list(), conflicts = {}, conflict, field;
 			for (var i =0, ii = conflict_list.length; i < ii; i++) {
-				var conflict = conflict_list[i];
+				conflict = conflict_list[i];
 				conflicts[conflict.field.schema_id()] = conflict;
 			}
-			for (var i = 0, ii = ff.length; i < ii; i++) {
-				var field = ff[i], conflict = conflicts[field.schema_id()];
+			for (i = 0, ii = ff.length; i < ii; i++) {
+				field = ff[i];
+				conflict = conflicts[field.schema_id()];
 				if (conflict) {
 					// console.log(">>> conflicts_resolved", field, conflict.version)
 					field.set_edited_value(conflict.value);
@@ -129,7 +130,7 @@ Spontaneous.EditPanel = (function($, S) {
 				if (class_name) { toolbar.addClass(class_name); }
 				return toolbar;
 			};
-			var editing = dom.form(['.editing-panel', this.parent_view.depth_class()], {'enctype':'multipart/form-data', 'accept-charset':'UTF-8', 'method':'post'})
+			var editing = dom.form(['.editing-panel', this.parent_view.depth_class()], {'enctype':'multipart/form-data', 'accept-charset':'UTF-8', 'method':'post'});
 			var toolbar = get_toolbar();
 			var outer = dom.div('.editing-fields');
 			var text_field_wrap = dom.div('.field-group.text');
@@ -137,10 +138,11 @@ Spontaneous.EditPanel = (function($, S) {
 			var text_fields = this.parent_view.text_fields();
 			var submit = dom.input({'type':'submit'});
 			var __dialogue = this;
-			var fieldViews = [];
+			var fieldViews = [], field, view;
 			editing.append(toolbar);
 			for (var i = 0, ii = text_fields.length; i < ii; i++) {
-				var field = text_fields[i], view = this.field_edit(field);
+				field = text_fields[i];
+				view = this.field_edit(field);
 				fieldViews.push(view);
 				text_field_wrap.append(view);
 			}
@@ -148,10 +150,13 @@ Spontaneous.EditPanel = (function($, S) {
 			if (text_fields.length > 0) {
 				outer.append(text_field_wrap);
 			}
-			var image_fields = this.parent_view.image_fields();
+			var image_fields = this.parent_view.image_fields()
+			, click = function() { __dialogue.field_focus(this); }
+			;
 
-			for (var i = 0, ii = image_fields.length; i < ii; i++) {
-				var field = image_fields[i], view = this.field_edit(field).click(function() { __dialogue.field_focus(this); });
+			for (i = 0, ii = image_fields.length; i < ii; i++) {
+				field = image_fields[i];
+				view = this.field_edit(field).click(click);
 				fieldViews.push(view);
 				image_field_wrap.append(view);
 			}
@@ -191,7 +196,7 @@ Spontaneous.EditPanel = (function($, S) {
 		tab_to_next: function(input, upwards) {
 			var active_field = $(input).data('field')
 			, text_fields = this.parent_view.text_fields(), position = 0, next_position, next_field
-			, direction = upwards ? -1 : 1;
+, direction = upwards ? -1 : 1;
 			for (var i = 0, ii = text_fields.length; i < ii; i++) {
 				if (text_fields[i] === active_field) {
 					position = i;
@@ -207,15 +212,15 @@ Spontaneous.EditPanel = (function($, S) {
 			var fields = this.parent_view.field_list();
 			$.each(fields, function(n, f) {
 				f.on_show();
-			})
-			if (!focus_field || !(focus_field['focus']) || !focus_field.accepts_focus) { focus_field = null; }
-			var focus_field = focus_field || this.parent_view.text_fields()[0];
+			});
+			if (!focus_field || !(focus_field.focus) || !focus_field.accepts_focus) { focus_field = null; }
+			focus_field = focus_field || this.parent_view.text_fields()[0];
 			if (focus_field) {
 				focus_field.focus();
 			}
 		},
 		field_focus: function(input) {
-			var active_field = $(input).data('field')
+			var active_field = $(input).data('field');
 			if (active_field === this.active_field) { return; }
 			if (active_field) {
 				this.active_field = active_field;
@@ -223,7 +228,7 @@ Spontaneous.EditPanel = (function($, S) {
 			}
 		},
 		field_blur: function(input) {
-			var active_field = $(input).data('field')
+			var active_field = $(input).data('field');
 			if (active_field) {
 				active_field.on_blur();
 			}
@@ -244,12 +249,12 @@ Spontaneous.EditPanel = (function($, S) {
 			field.editor = this;
 			var d = dom.div('.field');
 			// console.log("field_edit", field.type)
-			d.addClass(field.type.type.toLowerCase().split(".").splice(1).join("-"));
+			d.addClass(field.type.type.toLowerCase().split('.').splice(1).join('-'));
 			// d.append($(dom.label, {'class':'name', 'for':field.css_id()}).html(field.label()));
 			var label = dom.label('.name', {'for':field.css_id()}).html(field.label());
 			if (field.type.comment) {
 			var comment = dom.span('.comment').text('('+field.type.comment+')');
-			label.append(comment)
+			label.append(comment);
 			}
 			d.append(label);
 			var toolbar = field.toolbar();

data/application/js/editing.js

@@ -17,20 +17,27 @@ Spontaneous.Editing = (function($, S) {
 		},
 		goto_page: function(page) {
 			if (!page) { return; }
-			this.container.show().fadeOut(0)
-			S.Ajax.get(["/page", page.id].join("/"), this.page_loaded.bind(this));
+			this.container.show().velocity('fadeOut', 0);
+			S.Ajax.get(['/page', page.id].join('/'), this.page_loaded.bind(this));
 			this.set('location', page);
 		},
 		page_loaded: function(page_data) {
-			var page = this.get('page');
+			var self = this
+			, page = self.get('page')
+			, view = self.get('view')
+			, panel = self.container;
 			if (page) { page.unload(); }
+			if (view) { view.unload(); }
 			page = new Page(page_data);
-			page.watch('path', this.path_updated.bind(this));
+			page.watch('path', self.path_updated.bind(self));
 			view = new S.Views.PageView(page);
-			this.container.empty();
-			this.container.append(view.panel());
-			this.set('page', page);
-			this.container.fadeIn(300);
+			panel.animate({opacity: 0}, 0, function() {
+				panel.empty().show();
+				panel.append(view.panel());
+				self.set('page', page);
+				self.set('view', view);
+				panel.velocity({opacity: 1}, 200);
+			});
 		},
 		path_updated: function(path) {
 			this.set('path', path);
@@ -48,6 +55,12 @@ Spontaneous.Editing = (function($, S) {
 		},
 		show: function() {
 			this.container.show();
+		},
+		showLoading: function() {
+			this.container.velocity({'opacity': 0}, 100);
+		},
+		hideLoading: function() {
+			// let the page_loaded function deal with actually showing the new page
 		}
 	});
 	return Editing;

data/application/js/entry.js

@@ -7,7 +7,7 @@ Spontaneous.Entry = (function($, S) {
 		initialize: function(content, container) {
 			this.container = container;
 			this.callSuper(content);
-		},
+		}
 	});
 	return Entry;
 })(jQuery, Spontaneous);

data/application/js/extensions.js

@@ -2,7 +2,7 @@ if (!window.console) {
 	window.console = {
 		log: function() {},
 		warn: function() {},
-		error: function() {},
+		error: function() {}
 	};
 } else {
 	// var debug = Spontaneous.debug;
@@ -29,7 +29,7 @@ function $A(iterable) {
 	var length = iterable.length || 0, results = new Array(length);
 	while (length--) results[length] = iterable[length];
 	return results;
-};
+}
 
 (function($) {
 
@@ -40,7 +40,7 @@ function $A(iterable) {
 
 	var function_id = 0;
 
-	if (!(typeof Function.prototype.bind === 'function')) {
+	if (typeof Function.prototype.bind !== 'function') {
 		Function.prototype.bind = function() {
 			var __method = this, args = $A(arguments), object = args.shift();
 			return function() {
@@ -48,11 +48,11 @@ function $A(iterable) {
 			};
 		};
 	}
-	if (!(typeof Function.prototype.delay === 'function')) {
+	if (typeof Function.prototype.delay !== 'function') {
 		Function.prototype.delay = function(delay) {
 			var __function__ = this;
 			return function() {
-				window.setTimeout(__function__, delay)
+				window.setTimeout(__function__, delay);
 			};
 		};
 	}
@@ -71,9 +71,9 @@ function $A(iterable) {
 
 	$.extend(Number.prototype, {
 		to_filesize: function() {
-			var thou = 1000, units = [" B", ' kB', ' MB', ' GB'],
-			power = Math.floor(Math.log(this) / Math.log(thou))
-			return Math.round(this / (Math.pow(thou, power))) + units[power]
+			var thou = 1000, units = [' B', ' kB', ' MB', ' GB'],
+			power = Math.floor(Math.log(this) / Math.log(thou));
+			return Math.round(this / (Math.pow(thou, power))) + units[power];
 		}
 	});
 
@@ -81,13 +81,13 @@ function $A(iterable) {
 
 	$.fn.appear = function(callback) {
 		var $this = this, siblings = $this.siblings(), fade_in = function() {
-			$this.animate({'opacity':1}, {
+			$this.velocity({'opacity':1}, {
 				duration: opacity_change_duration,
 				complete: callback
 			});
 		};
 
-		if (siblings.length == 0) {
+		if (siblings.length === 0) {
 			// skip height animation and just fade the element in
 			// otherwise there's this weird gap where nothing seems to be
 			// happening. this only happens when the item being 'appeared' is
@@ -106,7 +106,7 @@ function $A(iterable) {
 
 	$.fn.disappear = function(callback) {
 		var $this = this;
-		this.animate({'opacity':0}, {
+		this.velocity({'opacity':0}, {
 			duration: opacity_change_duration,
 			complete: function() {
 				$this.animate({'height':'hide'}, {

data/application/js/field/boolean.js

@@ -3,21 +3,21 @@ Spontaneous.Field.Boolean = (function($, S) {
 	var BooleanField = new JS.Class(Spontaneous.Field.String, {
 		edit: function() {
 			var self = this
-			, w = dom.div(dom.id(self.css_id()))
+, w = dom.div(dom.id(self.css_id()))
 			, input = self.input() // ensure we have created the radio inputs $on & $off
 			, labels = self.type.labels
-			, label = function(label, radio) { return dom.label().text(label).prepend(radio); }
-			;
+, label = function(label, radio) { return dom.label().text(label).prepend(radio); };
+
 			w.append(label(labels['true'], self.$on), label(labels['false'], self.$off));
 			return w;
 		},
 		generate_input: function() {
 			var self = this
-			, checked = (this.get('unprocessed_value') == 'true')
+      , checked = (this.get('unprocessed_value') == 'true')
 			, click = function() { self.editor.field_focus(self.input()); }
 			, on = dom.radio({'name':this.form_name(), 'value': 'true', 'checked': checked})
-			, off = dom.radio({'name':this.form_name(), 'value': 'false', 'checked': !checked})
-			;
+			, off = dom.radio({'name':this.form_name(), 'value': 'false', 'checked': !checked});
+
 			self.$on = on;
 			self.$off = off;
 			return $(on).add(off).click(click);

data/application/js/field/date.js

@@ -4,7 +4,7 @@ Spontaneous.Field.Date = (function($, S) {
 	var DateField = new JS.Class(Spontaneous.Field.String, {
 		input: function() {
 			var input = this.callSuper();
-			input.datepicker({ "dateFormat": "DD, d MM yy" });
+			input.datepicker({ 'dateFormat': 'DD, d MM yy' });
 			return input;
 		},
 		dateFormat: function() {

data/application/js/field/file.js

@@ -6,29 +6,29 @@ Spontaneous.Field.File = (function($, S) {
 
 		currentValue: function() {
 			var pending, v = this.get('value');
-			if ((pending = v['__pending__'])) {
-				return pending['value'];
+			if ((pending = v.__pending__)) {
+				return pending.value;
 			}
 			return v;
 		},
 
 		currentFilename: function() {
-			return this.currentValue()['filename'];
+			return this.currentValue().filename;
 		},
 
 		currentFilesize: function() {
-			return this.currentValue()['filesize'];
+			return this.currentValue().filesize;
 		},
 
 		currentEditValue: function() {
 			var value, pending, ui, v = this.get('value');
-			if ((pending = v['__pending__'])) {
-				return pending['value'];
+			if ((pending = v.__pending__)) {
+				return pending.value;
 			}
-			value = v['original'];
-			if ((ui = v['__ui__'])) {
-				value['path'] = value['src'];
-				value['src'] = ui['src'];
+			value = v.original;
+			if ((ui = v.__ui__)) {
+				value.path = value.src;
+				value.src = ui.src;
 			}
 			return value;
 		},
@@ -36,7 +36,7 @@ Spontaneous.Field.File = (function($, S) {
 		preview: function() {
 			Spontaneous.UploadManager.register(this);
 			var self = this
-			, value = this.currentValue()
+, value = this.currentValue()
 			, filename = this.currentFilename();
 			var wrap = dom.div('.file-field');
 			var dropper = dom.div('.file-drop');
@@ -98,7 +98,7 @@ Spontaneous.Field.File = (function($, S) {
 			wrap.append(dropper, filename_info, filesize_info);
 
 			this.drop_target = dropper;
-			this.value_wrap =  wrap;
+			this.value_wrap = wrap;
 
 			return wrap;
 		},
@@ -133,7 +133,7 @@ Spontaneous.Field.File = (function($, S) {
 		},
 		disable_progress: function() {
 			this.progress_bar().parent().hide();
-			this.drop_target.add(this.value_wrap).removeClass('uploading')
+			this.drop_target.add(this.value_wrap).removeClass('uploading');
 		},
 		upload_progress: function(position, total) {
 			if (!this.drop_target.hasClass('uploading')) {
@@ -148,12 +148,12 @@ Spontaneous.Field.File = (function($, S) {
 
 		edit: function() {
 			var self = this;
-			var wrap = dom.div(".file-field", {'style':'position:relative;'});
+			var wrap = dom.div('.file-field', {'style':'position:relative;'});
 			var value = this.value();
 			var input = this.input();
 			var filename_info = dom.div('.filename');
 			var filesize_info = dom.div('.filesize');
-			var choose_files  = dom.a('.choose').text("Choose file...");
+			var choose_files = dom.a('.choose').text('Choose file...');
 
 			var set_info = function(filename, filesize) {
 				filename_info.text(filename);
@@ -168,7 +168,7 @@ Spontaneous.Field.File = (function($, S) {
 					this.selected_files = files;
 					this._edited_value = url;
 					window.URL.revokeObjectURL(url);
-					set_info(File.filename(file), file.fileSize)
+					set_info(File.filename(file), file.fileSize);
 				}
 			}.bind(this);
 
@@ -240,7 +240,7 @@ Spontaneous.Field.File = (function($, S) {
 			return filename;
 		},
 
-		accept_mimetype: "*/*",
+		accept_mimetype: '*/*',
 		generate_input: function() {
 			return dom.input({'type':'file', 'name':this.form_name(), 'accept':this.accept_mimetype});
 		},

data/application/js/field/image.js

@@ -1,6 +1,6 @@
 // console.log('Loading ImageField...')
 Spontaneous.Field.Image = (function($, S) {
-	"use strict";
+	'use strict';
 	var dom = S.Dom;
 	var ImageFieldConflictView = new JS.Class(S.Field.String.ConflictView, {
 
@@ -10,8 +10,8 @@ Spontaneous.Field.Image = (function($, S) {
 				image_outer = dom.div('.image-field-conflict.changes.differences'),
 				original = dom.div('.original.diff'),
 				edited = dom.div('.final.diff');
-			var local_label = dom.div('.diff').text("Server version");
-			var server_label = dom.div('.diff').text("Your version");
+			var local_label = dom.div('.diff').text('Server version');
+			var server_label = dom.div('.diff').text('Your version');
 			original.append(dom.img().attr('src', this.values.server_original)).click(function() {
 				this.useValue(this.values.server_original);
 				edited.add(original).removeClass('selected');
@@ -60,29 +60,29 @@ Spontaneous.Field.Image = (function($, S) {
 
 		currentValue: function() {
 			var pending, v = this.get('value');
-			if ((pending = v['__pending__'])) {
-				pending['path'] = pending['src'];
-				return pending['value'];
+			if ((pending = v.__pending__)) {
+				pending.path = pending.src;
+				return pending.value;
 			}
-			return v['__ui__'] || v['original'] || {};
+			return v.__ui__ || v.original || {};
 		},
 
 		currentEditValue: function() {
 			var value, pending, ui, v = this.get('value');
-			if ((pending = v['__pending__'])) {
-				return pending['value'];
+			if ((pending = v.__pending__)) {
+				return pending.value;
 			}
-			value = v['original'];
-			if ((ui = v['__ui__'])) {
-				value['path'] = value['src'];
-				value['src'] = ui['src'];
+			value = v.original;
+			if ((ui = v.__ui__)) {
+				value.path = value.src;
+				value.src = ui.src;
 			}
 			return value;
 		},
 
 		currentFilename: function() {
 			var v = this.get('value');
-			return (v['__pending__'] || v['original'])['filename'];
+			return (v.__pending__ || v.original).filename;
 		},
 		/*
 		* HACK: The async nature of image updates means that the version setting
@@ -99,9 +99,9 @@ Spontaneous.Field.Image = (function($, S) {
 		* weird problems with simultaneous updates.
 		*/
 		version: function() {
-			var pending, value = this.get("value");
-			if ((pending = value["__pending__"])) {
-				return pending["version"];
+			var pending, value = this.get('value');
+			if ((pending = value.__pending__)) {
+				return pending.version;
 			}
 			return this.data.version;
 		},
@@ -109,13 +109,13 @@ Spontaneous.Field.Image = (function($, S) {
 		preview: function() {
 			Spontaneous.UploadManager.register(this);
 			var self = this
-			, value = this.currentValue()
+, value = this.currentValue()
 			, src = value.src
-			, img = null
-			, dim = 45;
+, img = null
+, dim = 45;
 			// , container = container.parent('li');
 
-			if (src === "") {
+			if (src === '') {
 				img = dom.img('.missing-image', {'src':''});
 			} else {
 				img = dom.img();
@@ -175,8 +175,8 @@ Spontaneous.Field.Image = (function($, S) {
 						} else {
 							// container.removeClass('landscape');
 						}
-					}.bind(this))
-					image.attr('src', url)
+					}.bind(this));
+					image.attr('src', url);
 					// see http://www.htmlfivewow.com/slide25
 					window.URL.revokeObjectURL(url);
 				}
@@ -237,11 +237,11 @@ Spontaneous.Field.Image = (function($, S) {
 		},
 		upload_complete: function(values) {
 			this.mark_unmodified();
-			this.callSuper(values)
+			this.callSuper(values);
 			if (values) {
 				var value = this.currentValue();
 				if (this.image) {
-					var img = new Image()
+					var img = new Image();
 					img.onload = function() {
 						this.image.attr('src', value.src);
 					}.bind(this);
@@ -297,7 +297,7 @@ Spontaneous.Field.Image = (function($, S) {
 				filename_info.text(filename);
 				if (filesize) {
 					filesize_info.text(parseFloat(filesize, 10).to_filesize());
-				} else if (filesize === 0 || filesize === "0") {
+				} else if (filesize === 0 || filesize === '0') {
 					filesize_info.text('');
 				}
 
@@ -411,7 +411,7 @@ Spontaneous.Field.Image = (function($, S) {
 			this.preview_img.attr('src', value);
 			this.callSuper(value);
 		},
-		accept_mimetype: "image/*"
+		accept_mimetype: 'image/*'
 	});
 
 	ImageField.ConflictView = ImageFieldConflictView;