spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/application/js/field/string.js

@@ -11,8 +11,8 @@ Spontaneous.Field.String = (function($, S) {
 		},
 		panel: function() {
 			var labels = dom.div('.string-field-conflict.labels.differences'), outer = dom.div(), diff_outer = dom.div('.string-field-conflict.changes.differences'), local_diff = dom.div('.original.diff'), computed_diff = dom.div('.final.diff');
-			var local_diff_label = dom.div('.diff').text("Changes made by other person");
-			var final_diff_label = dom.div('.diff').text("Their changes merged with yours");
+			var local_diff_label = dom.div('.diff').text('Changes made by other person');
+			var final_diff_label = dom.div('.diff').text('Their changes merged with yours');
 			var server_change = this.diff(this.values.local_original, this.values.server_original);
 			var local_change = this.diff(this.values.local_original, this.values.local_edited);
 			var merge = this.differ.patch_apply(local_change.patches, this.values.server_original);
@@ -129,7 +129,7 @@ Spontaneous.Field.String = (function($, S) {
 			return this.title;
 		},
 		generate_input: function() {
-			return dom.input(dom.id(this.css_id()), {'type':'text', 'name':this.form_name(), 'value':this.unprocessed_value()})
+			return dom.input(dom.id(this.css_id()), {'type':'text', 'name':this.form_name(), 'value':this.unprocessed_value()});
 		},
 		input: function() {
 			if (!this._input) {

data/application/js/field/webvideo.js

@@ -16,11 +16,11 @@ Spontaneous.Field.WebVideo = (function($, S) {
 			// at the same time I want to replace an immediately inserted video player with an
 			// image + play button to reduce the impact of multiple videos on the cms ui load time
 			var value = this.get('value').replace(/autoplay=1/, '')
-			, iframe = dom.iframe({src:value, frameborder: 0, border: 0}).css({position: "absolute", top:0, left:0, height: "100%", width: "100%"});
+			, iframe = dom.iframe({src:value, frameborder: 0, border: 0}).css({position: 'absolute', top:0, left:0, height: '100%', width: '100%'});
 			if (!value) { // don't fill up the page with empty iframes...
 				return dom.div();
 			}
-			return dom.div().css({width: "100%", position: "relative", "padding-bottom":"56.25%", height: 0}).append(iframe)
+			return dom.div().css({width: '100%', position: 'relative', 'padding-bottom':'56.25%', height: 0}).append(iframe);
 		}
 	});
 

data/application/js/field_preview.js

@@ -55,6 +55,9 @@ Spontaneous.FieldPreview = (function($, S) {
 			}
 		});
 			return wrapper;
+		},
+		unload: function() {
+			// keep compatibility with the view api
 		}
 	});
 	return FieldPreview;

data/application/js/init.js

@@ -9,9 +9,10 @@ Spontaneous.Init = (function($, S) {
 
 		location.watch('location', top_bar.location_changed.bind(top_bar));
 		location.watch('location', content_area.location_changed.bind(content_area));
+		location.watch('loading_location', content_area.location_loading.bind(content_area));
 
-		top_bar.watch('mode',       content_area.display.bind(content_area));
-		top_bar.watch('mode',       location.view_mode_changed.bind(location));
+		top_bar.watch('mode', content_area.display.bind(content_area));
+		top_bar.watch('mode', location.view_mode_changed.bind(location));
 
 		S.Editing.watch('page', location.page_loaded.bind(location));
 		S.Editing.watch('path', location.path_changed.bind(location));

data/application/js/jquery-selection-position.js

@@ -7,7 +7,7 @@
  * @author Bevis Zhao (i@bevis.me, http://bevis.me)
  */
 (function($) {
-	"use strict";
+	'use strict';
 
 	var calculator = {
 		// key styles
@@ -26,7 +26,7 @@ specificStyle: {
 'overflow-y': 'auto'
 },
 
-simulator : $('<div id="textarea_simulator"/>').css({
+simulator: $('<div id="textarea_simulator"/>').css({
 	position: 'absolute',
 top: 0,
 left: 0,
@@ -53,7 +53,7 @@ visibility: 'hidden'
 								selectStart = element.selectionStart,
 								selectEnd = element.selectionEnd;
 
-						if (selectEnd === selectStart) { return false; };
+						if (selectEnd === selectStart) { return false; }
 
 						var beforeText = value.substring(0, selectStart),
 								selectedText = value.substring(selectStart, selectEnd),
@@ -69,7 +69,7 @@ visibility: 'hidden'
 
 						return {
 							top: focusOffset.top - simulatorOffset.top - element.scrollTop,
-								left: focus[0].offsetLeft -  cal.simulator[0].offsetLeft - element.scrollLeft,
+								left: focus[0].offsetLeft - cal.simulator[0].offsetLeft - element.scrollLeft,
 								width: focus.width(),
 								height: focus.height()
 						};
@@ -87,22 +87,22 @@ var showPopup = function(textarea, popup, offsetCalculator) {
 
 	// In order to use the size of the popup in the positioning calculations
 	// it needs to be visible in the dom.
-	popup.css("visibility", "hidden").show();
+	popup.css('visibility', 'hidden').show();
 	var place = offsetCalculator(pos);
-	popup.hide().css("visibility", "visible");
+	popup.css({opacity: 0}).css('visibility', 'visible');
 	if (top >= position.top && top < bottom) {
 		popup.css({
 			left: place.left,
 			top: place.top
-		}).fadeIn(100)
+		}).velocity({opacity: 1}, {duration: 100});
 	} else {
-		popup.fadeOut(100);
+		popup.velocity('fadeOut', 100);
 	}
 	return true;
-}
+};
 $.fn.extend({
 	getComputedStyle: function(styleName) {
-		if (this.length == 0) return;
+		if (this.length === 0) { return; }
 		var self = this[0], result = this.css(styleName);
 		result = result || ($.browser.msie ? self.currentStyle[styleName]: document.defaultView.getComputedStyle(self, null)[styleName]);
 		return result;
@@ -118,11 +118,11 @@ showSelectionPopup: function(popup, offsetCalculator) {
 	var callback = function() {
 		var selected = showPopup(self, popup, offsetCalculator);
 		if (!selected) {
-			self.unbind("scroll.popup").unbind("mouseup.popup");
+			self.unbind('scroll.popup').unbind('mouseup.popup');
 		}
 	};
-	self.bind("scroll.popup", callback);
-	self.bind("mouseup.popup",  callback.delay(1));
+	self.bind('scroll.popup', callback);
+	self.bind('mouseup.popup', callback.delay(1));
 	callback();
 }
 });

data/application/js/location.js

@@ -19,8 +19,8 @@ Spontaneous.Location = (function($, S) {
 		},
 		restore: function() {
 			if (this.mode) {
-				Spontaneous.Location.view_mode_changed(this.mode)
-				Spontaneous.TopBar.set_mode(this.mode)
+				Spontaneous.Location.view_mode_changed(this.mode);
+				Spontaneous.TopBar.set_mode(this.mode);
 			}
 			if (this.page_id) {
 				Spontaneous.Location.load_id(this.page_id);
@@ -32,29 +32,29 @@ Spontaneous.Location = (function($, S) {
 			return '#/'+(this.page_id || '') + (this.mode ? ('@' + this.mode) : '');
 		},
 		to_path: function() {
-			return [ajax.namespace, (this.page_id || ''), this.mode].join("/")
+			return [ajax.namespace, (this.page_id || ''), this.mode].join('/');
 		},
 		to_obj: function() {
 			return {
 				page_id: this.page_id,
 				mode: this.mode
-			}
+			};
 		}
 	});
 
 	State.extend({
 		// currently just produces some kind of loop
 		popstate: function(event) {
-			State.restore(event)
+			State.restore(event);
 			return false;
 		},
 		restore: function(event) {
-			var state = new State(window.location.pathname)
+			var state = new State(window.location.pathname);
 			state.restore();
 		},
 
 		page: function(location, mode) {
-			var s = new State
+			var s = new State();
 			s.page_id = location.id;
 			s.mode = mode;
 			window.history.replaceState(s.to_obj(), ''+s.page_id, s.to_path());
@@ -94,6 +94,7 @@ Spontaneous.Location = (function($, S) {
 				this.set('path', location.path);
 				this.update_state(location, this.get('view_mode'));
 			}
+			this.set('loading_location', null);
 		},
 		update_state: function(location, mode) {
 			State.page(location, mode);
@@ -112,14 +113,14 @@ Spontaneous.Location = (function($, S) {
 		},
 		url: function() {
 			var l = this.location();
-			return (l ? l.url : "/about");
+			return (l ? l.url : '/about');
 		},
 		location: function() {
 			return this.get('location');
 		},
 		update: function(location) {
 			this.set('location', location);
-			this.path_from_url(location.url)
+			this.path_from_url(location.url);
 		},
 		current_path: function() {
 			return this.path_from_url(this.url());
@@ -128,13 +129,13 @@ Spontaneous.Location = (function($, S) {
 			if (this.location() && path === this.location().path) {
 				return this.location();
 			}
-			this.retrieve('/map/path'+path, this.location_loaded.bind(this));
+			this.retrieve_with_progress('/map/path'+path, this.location_loaded.bind(this));
 		},
 		find_id: function(id) {
 			if (this.location() && id === this.location().id) {
 				return this.location();
 			}
-			this.retrieve('/map/'+id, this.location_loaded.bind(this));
+			this.retrieve_with_progress('/map/'+id, this.location_loaded.bind(this));
 		},
 		path_from_url: function(url) {
 			var map = this.get('map'),
@@ -142,7 +143,7 @@ Spontaneous.Location = (function($, S) {
 			path = [], i, ii,
 			parts = url.split('/').slice(1), position = 0;
 			// add root to path
-			path.push({selected:0, pages:[ map ], root:true});;
+			path.push({selected:0, pages:[map], root:true});
 			while (position < parts.length) {
 				for (i = 0, ii = children.length; i < ii; i++) {
 					var child = children[i], slug = child.url.split('/').slice(-1)[0];
@@ -156,6 +157,10 @@ Spontaneous.Location = (function($, S) {
 			}
 			return path;
 		},
+		retrieve_with_progress: function(url, callback) {
+			this.set('loading_location', url);
+			return this.retrieve(url, callback);
+		},
 		retrieve: function(url, callback) {
 			ajax.get(url, {}, callback, {ifModified: true, cache: true});
 		},

data/application/js/login.js

@@ -31,7 +31,7 @@
 			var $this = $(this);
 			$.ajax({
 				url: $this.attr('action'),
-				type: "POST",
+				type: 'POST',
 				data:$this.serialize(),
 				success: function(data) {
 					if (data.key) {
@@ -44,7 +44,7 @@
 						$('#failed-name').text($('#user-login').val());
 						$(this).fadeIn();
 					});
-					$("#error-message:hidden").slideDown(200);
+					$('#error-message:hidden').slideDown(200);
 				},
 				dataType: 'json'
 			});

data/application/js/meta_view/user_admin.js

@@ -27,10 +27,10 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		var levels = this.levels;
 		var nonePosition = function() {
 			for (var i = 0, ii = levels.length; i < ii; i++) {
-				if (levels[i].levelName() === "none") {
+				if (levels[i].levelName() === 'none') {
 					return i;
 				}
-			};
+			}
 		}();
 		return levels[nonePosition + 1];
 	};
@@ -43,17 +43,17 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		element: function(cancelCallback) {
 			var self = this;
 			var levels = Level.levels;
-			var currentLevel = Level.get(this.user.get("level")) || Level.defaultLevel();
-			var outer = dom.div(".level-select");
-			var input = dom.input({type: "hidden", name: Input.inputName(this.name), value: currentLevel.levelName()});
-			var select = dom.div(".select").hide();
-			var value = dom.div(".level-value").text(currentLevel.title());
+			var currentLevel = Level.get(this.user.get('level')) || Level.defaultLevel();
+			var outer = dom.div('.level-select');
+			var input = dom.input({type: 'hidden', name: Input.inputName(this.name), value: currentLevel.levelName()});
+			var select = dom.div('.select').hide();
+			var value = dom.div('.level-value').text(currentLevel.title());
 			levels.forEach(function(level) {
-				var row = dom.div(".level").addClass("level-" + level.levelName());
-				row.append(dom.span(".level-name").text(level.title()));
-				row.append(dom.span(".level-publish").text("Publish").addClass(""+level.canPublish()));
-				row.append(dom.span(".level-admin").text("Admin").addClass(""+level.isAdmin()));
-				row.data("level", level);
+				var row = dom.div('.level').addClass('level-' + level.levelName());
+				row.append(dom.span('.level-name').text(level.title()));
+				row.append(dom.span('.level-publish').text('Publish').addClass(''+level.canPublish()));
+				row.append(dom.span('.level-admin').text('Admin').addClass(''+level.isAdmin()));
+				row.data('level', level);
 				row.click(function() {
 					self.choose(level);
 					return false;
@@ -75,12 +75,12 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			var pulldown = this.pulldown;
 			pulldown.fadeIn(100);
 			var level = this.currentLevel();
-			var options = pulldown.find(".level");
+			var options = pulldown.find('.level');
 			var levelDiv = options.filter(function(div) {
-				return $(this).data("level").levelName() == level.levelName();
+				return $(this).data('level').levelName() == level.levelName();
 			})[0];
 			var pos = $(levelDiv).position();
-			pulldown.css("top", dom.px(-pos.top));
+			pulldown.css('top', dom.px(-pos.top));
 		},
 
 		choose: function(level) {
@@ -89,7 +89,7 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 
 			this.close();
 		},
-		close: function( ) {
+		close: function() {
 			this.pulldown.fadeOut(100);
 		},
 		activate: function() {
@@ -113,21 +113,21 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			this.value = value;
 		},
 		element: function(cancelCallback) {
-			var type = (this.name === "email" ? "email" : "text");
+			var type = (this.name === 'email' ? 'email' : 'text');
 			var input = dom.input({
 				name: this.inputName(),
 				value: this.value,
 				type: type
 			}).focus(function() {
-				$(this).parents("p").addClass("focus");
+				$(this).parents('p').addClass('focus');
 			}).blur(function() {
-				$(this).parents("p").removeClass("focus");
+				$(this).parents('p').removeClass('focus');
 			}).keydown(function(event) {
 				if (event.keyCode === 27) { cancelCallback(); }
 			});
 			// TODO: catch RETURN and ESCAPE
 			return input;
-		}.cache("input"),
+		}.cache('input'),
 		inputName: function() { return Input.inputName(this.name); },
 		isModified: function() {
 			// TODO: compare current value of input against original value
@@ -136,12 +136,12 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		showError: function(errors) {
 			var error = errors[0]
 			, element = this.element()
-			, errorWrap = dom.div(".error").append(dom.span().text(error)).hide();
+			, errorWrap = dom.div('.error').append(dom.span().text(error)).hide();
 			element.after(errorWrap);
 			errorWrap.fadeIn(300);
 		},
 		hideError: function() {
-			var error = this.element().next(".error");
+			var error = this.element().next('.error');
 			error.fadeOut(100, function() {
 				error.remove();
 			});
@@ -149,71 +149,71 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 	});
 
 	Input.inputName = function(name) {
-		return "user[" + name + "]";
+		return 'user[' + name + ']';
 	};
 
 	var responseCallback = function(complete, successCallback, failCallback) {
-		var isFunction = function(f) { return (typeof f === "function"); }
+		var isFunction = function(f) { return (typeof f === 'function'); };
 		return function(result, status) {
-			if (status === "success") {
+			if (status === 'success') {
 				if (isFunction(complete)) { complete(result); }
 				if (isFunction(successCallback)) { successCallback(result); }
 			} else {
 				if (isFunction(failCallback)) { failCallback(result); }
 			}
-		}
+		};
 	};
 
 	var UserController = {
-		save:   function(user, params, successCallback, failCallback) {
-			var url = ["/users", user.get("id")].join("/");
+		save: function(user, params, successCallback, failCallback) {
+			var url = ['/users', user.get('id')].join('/');
 			ajax.put(url, params, responseCallback(function(result) {
 				user.update(result);
 			}, successCallback, failCallback));
 		},
 		create: function(user, params, successCallback, failCallback) {
-			var url = "/users";
+			var url = '/users';
 			ajax.post(url, params, responseCallback(function(result) {
 				user.update(result);
 			}, successCallback, failCallback));
 		},
 		delete: function(user, successCallback, failCallback) {
-			var url = ["/users", user.get("id")].join("/");
+			var url = ['/users', user.get('id')].join('/');
 			ajax.del(url, {}, responseCallback(function(result) {
 
 			}, successCallback, failCallback));
 		},
 		enable: function(user, enabled, successCallback, failCallback) {
-			var action = (enabled ? "enable" : "disable")
-			, url = ["/users", action, user.get("id")].join("/");
+			var action = (enabled ? 'enable' : 'disable')
+			, url = ['/users', action, user.get('id')].join('/');
 			ajax.put(url, {}, responseCallback(function(result) {
-				user.set("disabled", !enabled);
+				user.set('disabled', !enabled);
 			}, successCallback, failCallback));
 		},
 		logout: function(user, successCallback, failCallback) {
-			var url = ["/users", "keys", user.get("id")].join("/");
+			var url = ['/users', 'keys', user.get('id')].join('/');
 			ajax.del(url, {}, responseCallback(function(result) {
 
 			},successCallback, failCallback));
-		},
+		}
 	};
 
 	var EditUserView = new JS.Class({
 		initialize: function(parent, user) {
 			this.parent = parent;
-			this.user   = user;
+			this.user = user;
 		},
 		titleText: function() {
-			return "Editing User “" + this.user.get("name") + "”";
+			return 'Editing User “' + this.user.get('name') + '”';
 		},
 		view: function() {
 			var self = this;
 			var user = this.user;
 			var wrap = dom.div();
-			var form = dom.form({method: "post", action: ajax.request_url("/users/"+ user.get("id"))})
+			var form = dom.form({method: 'post', action: ajax.request_url('/users/'+ user.get('id'))});
 			var inputs = {};
 			var p, label, input, value;
-			var titleBar = dom.div(".title").append(dom.span().text(this.titleText()));
+			var titleBar = dom.div('.title').append(dom.span().text(this.titleText()));
 
 			form.append(self.aboveUserAttributes());
 
@@ -221,10 +221,10 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 				self.parent.closeUser();
 			};
 			self.editableAttributes().forEach(function(name) {
-				p = dom.p()
+				p = dom.p();
 				label = dom.label().text(name);
 				input = self.inputForAttribute(name);
-				value = dom.div(".value").append(input.element(cancel));
+				value = dom.div('.value').append(input.element(cancel));
 				p.append(label, value);
 				form.append(p);
 				inputs[name] = input;
@@ -241,14 +241,14 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 				self.save(form, saveComplete, saveFail);
 				return false;
 			};
-			var cancelBtn = dom.a(".button.cancel").text("Cancel").click(cancel);
-			var saveBtn = dom.button(".button", {type: "submit"}).text(self.saveButtonText()).click(performSave);
-			p.append(cancelBtn, dom.div(".gap"), saveBtn);
+			var cancelBtn = dom.a('.button.cancel').text('Cancel').click(cancel);
+			var saveBtn = dom.button('.button', {type: 'submit'}).text(self.saveButtonText()).click(performSave);
+			p.append(cancelBtn, dom.div('.gap'), saveBtn);
 			form.append(p);
 			form.submit(performSave);
 			this.inputs = inputs;
 			form.find('input[type="text"]:first').focus().select();
-			wrap.append(titleBar, form)
+			wrap.append(titleBar, form);
 			return wrap;
 		},
 		verificationErrors: function(errors) {
@@ -258,42 +258,42 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			});
 		},
 		saveButtonText: function() {
-			return "Save";
+			return 'Save';
 		},
 		inputForAttribute: function(name) {
-			if (name === "level") {
+			if (name === 'level') {
 				return new LevelSelect(name, this.user);
 			}
 			return new Input(name, this.user.get(name));
 		},
 		editableAttributes: function() {
-			return ["login", "name", "email", "level"];
+			return ['login', 'name', 'email', 'level'];
 		},
 		aboveUserAttributes: function() {
 			var self = this;
-			var user = this.user
-			var admin = dom.div(".admin");
-			p = dom.p(".enabled");
-			label = dom.label().text("Enabled");
-			var checkbox = dom.input({type:"checkbox", checked: (!user.get("disabled"))}).click(function() {
-				var enabled = $(this).attr("checked") === "checked";
+			var user = this.user;
+			var admin = dom.div('.admin');
+			p = dom.p('.enabled');
+			label = dom.label().text('Enabled');
+			var checkbox = dom.input({type:'checkbox', checked: (!user.get('disabled'))}).click(function() {
+				var enabled = $(this).attr('checked') === 'checked';
 				UserController.enable(user, enabled);
 				return false;
 			});
-			user.watch("disabled", function(disabled) {
-				checkbox.attr("checked", !disabled);
+			user.watch('disabled', function(disabled) {
+				checkbox.attr('checked', !disabled);
 			});
 			label.append(checkbox);
 			p.append(label);
 			admin.append(p);
 
-			admin.append(dom.p(".gap"));
-			p = dom.p(".log-off");
-			var btn = dom.a(".button.log-out").text("Log "+user.get("login")+" Out").click(function() {
+			admin.append(dom.p('.gap'));
+			p = dom.p('.log-off');
+			var btn = dom.a('.button.log-out').text('Log '+user.get('login')+' Out').click(function() {
 				var $this = $(this);
-				$this.addClass("pending");
+				$this.addClass('pending');
 				UserController.logout(user, function() {
-					$this.removeClass("pending").addClass("complete").text("Logged Out");
+					$this.removeClass('pending').addClass('complete').text('Logged Out');
 				});
 			});
 			p.append(btn);
@@ -324,32 +324,32 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		},
 		save: function(form, successCallback, failCallback) {
 			var self = this
-			, params = self.serialiseForm(form)
+, params = self.serialiseForm(form);
 			UserController.save(self.user, params, successCallback, failCallback);
 		}
 	});
 
 	var CreateUserView = new JS.Class(EditUserView, {
 		titleText: function() {
-			return "Create User";
+			return 'Create User';
 		},
 		aboveUserAttributes: function() {
-			return "";
+			return '';
 		},
 		belowUserAttributes: function() {
-			return "";
+			return '';
 		},
 		editableAttributes: function() {
-			return ["login", "name", "email", "password", "level"];
+			return ['login', 'name', 'email', 'password', 'level'];
 		},
 		saveButtonText: function() {
-			return "Create";
+			return 'Create';
 		},
 		save: function(form, successCallback, failCallback) {
 			var self = this
-			, params = self.serialiseForm(form)
+, params = self.serialiseForm(form)
 			, callback = function(params) {
-				if (typeof successCallback === "function") {
+				if (typeof successCallback === 'function') {
 					successCallback(params);
 				}
 				self.parent.addUser(self.user);
@@ -371,7 +371,7 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			$.each(attributes, function(key, val) {
 				self.set(key, val);
 			});
-		},
+		}
 	});
 
 	var UserAdmin = new JS.Class({
@@ -385,15 +385,15 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 				return;
 			}
 			var self = this;
-			var outer = dom.div("#user-admin-container");
-			var title = dom.div(".title.main").append(dom.span().text("CMS Users"));
-			var contents = dom.div(".contents");
-			var edit = dom.div(".edit").hide();
-			var done = dom.a(".button.done").text("Done").click(function() {
+			var outer = dom.div('#user-admin-container');
+			var title = dom.div('.title.main').append(dom.span().text('CMS Users'));
+			var contents = dom.div('.contents');
+			var edit = dom.div('.edit').hide();
+			var done = dom.a('.button.done').text('Done').click(function() {
 				self.close();
 			});
-			var addWrapper = dom.div(".add-user")
-			var addButton  = dom.a(".button.add").text("Create User").click(function() {
+			var addWrapper = dom.div('.add-user');
+			var addButton = dom.a('.button.add').text('Create User').click(function() {
 				self.createUser();
 			});
 			addWrapper.append(addButton);
@@ -404,8 +404,8 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			this.titleContainer = title;
 			this.contentsContainer = contents;
 			this.editContainer = edit;
-			container.append(outer)
-			ajax.get("/users", this.ready.bind(this));
+			container.append(outer);
+			ajax.get('/users', this.ready.bind(this));
 		},
 		createUser: function() {
 			var user = new User(this, {});
@@ -434,11 +434,11 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		},
 		listEntry: function(user) {
 			var self = this;
-			var row = dom.div(".user");
-			row.attr("id", "user-admin-" + user.get("id"));
-			var cells = ["name", "level"].map(function(attr) {
+			var row = dom.div('.user');
+			row.attr('id', 'user-admin-' + user.get('id'));
+			var cells = ['name', 'level'].map(function(attr) {
 				var div = dom.div().addClass(attr).text(user.get(attr)).click(function() {
-					self.editUser(user)
+					self.editUser(user);
 					return false;
 				});
 				user.watch(attr, function(newValue) {
@@ -448,19 +448,19 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			});
 			var disabledState = function(disabled) {
 				if (disabled) {
-					row.addClass("disabled");
+					row.addClass('disabled');
 				} else {
-					row.removeClass("disabled");
+					row.removeClass('disabled');
 				}
 			};
-			user.watch("disabled", disabledState);
-			disabledState(user.get("disabled"));
-			var del = dom.div(".delete").click(function() {
+			user.watch('disabled', disabledState);
+			disabledState(user.get('disabled'));
+			var del = dom.div('.delete').click(function() {
 				self.confirmDeleteUser(user);
 				return false;
 			});
 			cells.push(del);
-			row.append.apply(row, cells)
+			row.append.apply(row, cells);
 			return row;
 		},
 		animationDuration: 300,
@@ -472,19 +472,19 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			var animationDuration = self.animationDuration;
 			var edit = this.editContainer.empty();
 			var list = this.contentsContainer;
-			var back = dom.div(".back");
+			var back = dom.div('.back');
 			edit.append(back, viewInstance.view());
-			edit.css({ left: "100%", opacity: 0 }).show();
-			list.animate({ opacity: 0.2 }, animationDuration);
-			edit.animate({ left: "48px", opacity: 1 }, animationDuration, "swing")
+			edit.css({ left: '100%', opacity: 0 }).show();
+			list.velocity({ opacity: 0.2 }, animationDuration);
+			edit.velocity({ left: '48px', opacity: 1 }, animationDuration, 'swing');
 			viewInstance.activate();
 		},
 		closeUser: function() {
 			var animationDuration = this.animationDuration;
 			var edit = this.editContainer.empty();
 			var list = this.contentsContainer;
-			list.animate({ opacity: 1 }, animationDuration);
-			edit.animate({ left: "100%", opacity: 0 }, animationDuration, function() {
+			list.velocity({ opacity: 1 }, animationDuration);
+			edit.velocity({ left: '100%', opacity: 0 }, animationDuration, function() {
 				edit.empty().hide();
 			});
 		},
@@ -492,9 +492,9 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 			var dialogue = Spontaneous.Popover.open(event, new ConfirmDeletePopup(this, user));
 		},
 		deleteUser: function(user) {
-			var url = ["/users", user.get("id")].join("/");
+			var url = ['/users', user.get('id')].join('/');
 			ajax.del(url, {}, function(result, status) {
-				if (status === "success") {
+				if (status === 'success') {
 					user.listEntry.disappear();
 				}
 			});
@@ -513,7 +513,7 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 		// 	return 208;
 		// },
 		title: function() {
-			return "Delete user “" + (this.user.get("login")) + "”";
+			return 'Delete user “' + (this.user.get('login')) + '”';
 		},
 		position_from_event: function(target) {
 			var pos = this.position_from_element(target);
@@ -527,13 +527,13 @@ Spontaneous.MetaView.UserAdmin = (function($, S){
 				return false;
 			});
 
-			var ok = dom.a('.ok').text("Delete").click(function() {
+			var ok = dom.a('.ok').text('Delete').click(function() {
 				self.close();
 				__entry.deleteUser(self.user);
 				return false;
 			});
-			var cancel = dom.a('.cancel').text("Cancel");
-			w.append(cancel, ok)
+			var cancel = dom.a('.cancel').text('Cancel');
+			w.append(cancel, ok);
 			return w;
 		}
 	});