spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/application/js/require.js

@@ -8,21 +8,21 @@ Spontaneous.Require = {
 		this.async = asynchronous;
 		var body = document.body;
 		var splash = document.createElement('div');
-		splash.id = "script-load-splash";
+		splash.id = 'script-load-splash';
 			var progress_outer = document.createElement('div');
-			progress_outer.id = "script-load-progress";
+			progress_outer.id = 'script-load-progress';
 		if (this.async) {
 			var progress_inner = document.createElement('div');
 			progress_outer.appendChild(progress_inner);
 			this.bar = progress_inner;
 			this.progress(0);
 		} else {
-			progress_outer.className = "synchronous";
-			progress_outer.innerHTML = "Loading...";
+			progress_outer.className = 'synchronous';
+			progress_outer.innerHTML = 'Loading...';
 		}
 		splash.appendChild(progress_outer);
 		body.appendChild(splash);
-		this.container = splash
+		this.container = splash;
 	},
 	remove: function() {
 		document.body.removeChild(this.container);
@@ -49,19 +49,19 @@ Spontaneous.Require = {
 		if (this.current) {
 			total += this.current[1];
 		}
-		for (var i = 0, ii = this._completed.length; i < ii; i++) {
+		for (i = 0, ii = this._completed.length; i < ii; i++) {
 			total += this._completed[i][1];
 		}
 		return total;
 	},
 	add: function(script) {
-		this.pending.push(script)
+		this.pending.push(script);
 		if (!this.current) { this.next(); }
 	},
 	script_url: function(src) {
 		var url = src;
 		if (Spontaneous.development) {
-			url += "?"+(new Date()).valueOf();
+			url += '?'+(new Date()).valueOf();
 		}
 		return url;
 	},
@@ -76,16 +76,16 @@ Spontaneous.Require = {
 		this.current = s;
 		if (this.async) {
 			var xhr = new XMLHttpRequest();
-			xhr.open("GET", this.script_url(s[0]), true);
+			xhr.open('GET', this.script_url(s[0]), true);
 			var onprogress = (function(req) {
 				return function(event) {
 					req.onprogress(event);
-				}
+				};
 			})(this);
 			var onreadystatechange = (function(req) {
 				return function(event) {
 					req.onreadystatechange(event);
-				}
+				};
 			})(this);
 			xhr.onprogress = onprogress;
 			xhr.onreadystatechange = onreadystatechange;
@@ -117,7 +117,7 @@ Spontaneous.Require = {
 			var script = document.createElement('script');
 			script.type = 'text/javascript';
 			script.text = xhr.responseText;
-			body.appendChild(script)
+			body.appendChild(script);
 			this._completed.push(this.current);
 			this.position = 0;
 			this.next();
@@ -125,5 +125,5 @@ Spontaneous.Require = {
 	}
 };
 Spontaneous.require = function(script) {
-	Spontaneous.Require.add(script)
-}
+	Spontaneous.Require.add(script);
+};

data/application/js/services.js

@@ -8,7 +8,7 @@ Spontaneous.Services = (function($, S) {
 			this.set('services', serviceData);
 		},
 		serviceList: function() {
-			return this.get("services");
+			return this.get('services');
 		},
 		open: function(service) {
 			S.TopBar.showService(service);
@@ -19,14 +19,14 @@ Spontaneous.Services = (function($, S) {
 			S.ContentArea.hideService();
 		},
 		init: function(container) {
-			this.iframe = dom.iframe("#services_pane", {'src':'about:blank'})
+			this.iframe = dom.iframe('#services_pane', {'src':'about:blank'});
 			this.iframe.hide();
 			container.append(this.iframe);
 			return this;
 		},
 		display: function(url) {
 			var iframe = this.iframe;
-			iframe.fadeIn(200);
+			iframe.velocity('fadeIn', 200);
 			// iframe.bind('ready.services', function() {
 			// 	iframe.fadeIn(200);
 			// });

data/application/js/sharded_upload.js

@@ -27,7 +27,7 @@ Spontaneous.ShardedUpload = (function($, S) {
 		compute_hash: function(array_buffer) {
 			var bytes = new Uint8Array(array_buffer);
 			var sha = Crypto.SHA1(bytes);
-			this.hash = sha
+			this.hash = sha;
 			this.begin_upload();
 			this.failure_count = 0;
 		},
@@ -39,7 +39,7 @@ Spontaneous.ShardedUpload = (function($, S) {
 			S.Ajax.get(['/shard', this.hash].join('/'), this.status_complete.bind(this));
 		},
 		status_complete: function(data, status, xhr) {
-			if (status === "success") {
+			if (status === 'success') {
 				// we're actually done
 				this.complete();
 			} else {
@@ -63,7 +63,7 @@ Spontaneous.ShardedUpload = (function($, S) {
 			var xhr = S.Ajax.authenticatedRequest();
 			var upload = xhr.upload;
 
-			xhr.open("POST", path, true);
+			xhr.open('POST', path, true);
 			upload.onprogress = this.onprogress.bind(this);
 			upload.onload = this.onload.bind(this);
 			upload.onloadend = this.onloadend.bind(this);
@@ -121,16 +121,17 @@ Spontaneous.ShardedUpload = (function($, S) {
 			this.start_with_index(0);
 		},
 		start_with_index: function(index) {
+			var shard;
 			if (index < this.shard_count()) {
-				var shard = new Shard(this, index, this.slice(index));
+				shard = new Shard(this, index, this.slice(index));
 				this.current = shard;
 				shard.start();
 			} else {
 				if (this.failed.length === 0) {
 					this.finalize();
 				} else {
-					var shard = this.failed.pop();
-					console.warn('retrying failed shard', shard)
+					shard = this.failed.pop();
+					console.warn('retrying failed shard', shard);
 					this.current = shard;
 					shard.retry();
 				}
@@ -146,9 +147,9 @@ Spontaneous.ShardedUpload = (function($, S) {
 			this.request(this.method, this.path(), form);
 		},
 		path: function() {
-			return ["/shard", this.target_id].join('/');
+			return ['/shard', this.target_id].join('/');
 		},
-		method: "PUT",
+		method: 'PUT',
 		hashes: function() {
 			var hashes = [];
 			for (var i = 0, ii = this.completed.length; i < ii; i++) {

data/application/js/side_bar.js

@@ -6,20 +6,20 @@ Spontaneous.SideBar = (function($, S) {
 	var side_bar = {
 		panel: function() {
 			this.panel = dom.div('#side-bar');
-			this.logo_panel = dom.div('#logo')
-			this.page_info_panel = dom.div('.page-info')
-			this.user_panel = dom.div('#user')
+			this.logo_panel = dom.div('#logo');
+			this.page_info_panel = dom.div('.page-info');
+			this.user_panel = dom.div('#user');
 			this.panel.append(this.logo_panel).append(this.page_info_panel).append(this.user_panel);
 			return this.panel;
 		},
 		location_changed: function(location) {
-			console.log('page-loaded', location)
+			console.log('page-loaded', location);
 			this.page_info_panel.text(location.url);
 		},
 		spinner: function() {
 			if (!this._spinner) {
 				this._spinner = Spontaneous.Progress(this.logo_panel[0], 48, {
-					spinner_fg_color: "#fff",
+					spinner_fg_color: '#fff',
 					period: 850
 				});
 			}

data/application/js/state.js

@@ -44,7 +44,7 @@ Spontaneous.State = (function($, S) {
 		},
 		getFieldMetadata: function(field, key) {
 			var s = this.state, f = (s.fields || {})[field.schema_id()] || {};
-			return f[key]
+			return f[key];
 		}
 	});
 	var State = new JS.Singleton({
@@ -60,7 +60,7 @@ Spontaneous.State = (function($, S) {
 		active_box: function(content) {
 			var s = this.get(content);
 			return s.active_box();
-		},
+		}
 		// activate_slot: function(content, slot) {
 		// 	var s = this.get(content);
 		// 	s.activate_slot(slot);

data/application/js/status_bar.js

@@ -17,20 +17,20 @@ Spontaneous.StatusBar = (function($, S) {
 			this.showing = false;
 			var duration = 200;
 			window.setTimeout(function() {
-				// S.ContentArea.wrap.animate({'bottom': 0}, duration);
-				// S.Dialogue.overlay().animate({'bottom': 0}, duration);
-				this.container.animate({'height': 0}, duration, function() { /* this.container.hide() */ }.bind(this));
+				// S.ContentArea.wrap.velocity({'bottom': 0}, duration);
+				// S.Dialogue.overlay().velocity({'bottom': 0}, duration);
+				this.container.velocity({'height': 0}, duration, function() { /* this.container.hide() */ }.bind(this));
 			}.bind(this), 500);
 		},
 		show: function() {
 			if (this.showing) { return; }
 			this.showing = true;
 			var duration = 200, height = 32;
-			// S.ContentArea.wrap.animate({'bottom': height}, duration);
-			// S.Dialogue.overlay().animate({'bottom': height}, duration);
+			// S.ContentArea.wrap.velocity({'bottom': height}, duration);
+			// S.Dialogue.overlay().velocity({'bottom': height}, duration);
 			this.container.css('height', 0+'px');
 			this.container.show();
-			this.container.animate({'height': height}, duration);
+			this.container.velocity({'height': height}, duration);
 		},
 		progress_container: function() {
 			if (!this._progress_container) {

data/application/js/top_bar.js

@@ -5,16 +5,16 @@ Spontaneous.TopBar = (function($, S) {
 
 	var disableParent = function(el) {
 		el.hover(function() {
-			$(this).parent().addClass("disabled");
+			$(this).parent().addClass('disabled');
 		}, function() {
-			$(this).parent().removeClass("disabled");
+			$(this).parent().removeClass('disabled');
 		});
 		return el;
 	};
 
 	var slugComparator = function(a, b) {
 		var at = a.slug, bt = b.slug;
-		if (at > bt) { return  1; }
+		if (at > bt) { return 1; }
 		if (at < bt) { return -1; }
 		return 0;
 	};
@@ -24,19 +24,22 @@ Spontaneous.TopBar = (function($, S) {
 			this.roots = roots;
 		},
 		width: function() { return 300; },
-		title: function() { return "Choose Root"; },
-		view:  function() {
-			var self = this, w = dom.div('#navigation-page-browser.pop-root-browser'), list = dom.div(".pages"), roots = this.roots.roots;
+		title: function() { return 'Choose Root'; },
+		view: function() {
+			var self = this
+			, w = dom.div('#navigation-page-browser.pop-root-browser')
+			, list = dom.div('.pages')
+			, roots = this.roots.roots;
 			var click = function(page_id) {
 				return function() { self.close(); S.Location.load_id(page_id); };
 			};
 			for (var key in roots) {
 				if (roots.hasOwnProperty(key)) {
-					var r = dom.div(".page").text(key).click(click(roots[key]));
+					var r = dom.div('.page').text(key).click(click(roots[key]));
 					list.append(r);
 				}
 			}
-			frame.append(list);
+			w.append(list);
 			this.wrapper = w;
 			return w;
 		}
@@ -48,26 +51,26 @@ Spontaneous.TopBar = (function($, S) {
 			this.pages = pages;
 		},
 		width: function() { return 300; },
-		title: function() { return "Go to Page"; },
-		view:  function() {
+		title: function() { return 'Go to Page'; },
+		view: function() {
 			var self = this, w = dom.div('#navigation-page-browser.pop-root-browser')
-			, list = dom.div(".pages")
-			, frame = dom.div(".frame")
-			, searchArea = dom.div(".search")
-			, searchInput = dom.input({type: "search", placeholder:"Search"});
+			, list = dom.div('.pages')
+			, frame = dom.div('.frame')
+			, searchArea = dom.div('.search')
+			, searchInput = dom.input({type: 'search', placeholder:'Search'});
 			searchArea.append(searchInput);
-			searchInput.bind("change keyup search", self.updateSearch.bind(self, searchInput));
+			searchInput.bind('change keyup search', self.updateSearch.bind(self, searchInput));
 			self.wrapper = w;
 			self.list = list;
 			frame.append(list);
-			w.append(searchArea, frame)
+			w.append(searchArea, frame);
 			this.loadPages();
 			return w;
 		},
 		updateSearch: function(input) {
 			if (!this.pages) { return; }
 
-			var self = this, boxes = {}, query = input.val(), search = new RegExp(query, "i");
+			var self = this, boxes = {}, query = input.val(), search = new RegExp(query, 'i');
 			// need to bubble up the event if the query is identical as this event
 			// is also triggered on input blur when a page is clicked.
 			if (query === this.query) {
@@ -75,7 +78,7 @@ Spontaneous.TopBar = (function($, S) {
 			}
 
 			this.query = query;
-			if (query === "") {
+			if (query === '') {
 				self.listPages(this.pages);
 				return;
 			}
@@ -100,7 +103,7 @@ Spontaneous.TopBar = (function($, S) {
 			if (this.pages) {
 				this.listPages(this.pages);
 			} else {
-				var path = ["/map", this.origin.id].join("/")
+				var path = ['/map', this.origin.id].join('/');
 				S.Location.retrieve(path, this.pagesLoaded.bind(this));
 			}
 		},
@@ -113,21 +116,21 @@ Spontaneous.TopBar = (function($, S) {
 				return function() {
 					self.close();
 					S.Location.load_id(p.id);
-				}
+				};
 			};
 			self.clearList();
 			if (Object.keys(generation).length === 0) {
-				var msg = filter ? "No matches for ‘"+filter+"’" : "No pages";
-				self.list.append(dom.h3().text(msg))
+				var msg = filter ? 'No matches for ‘'+filter+'’' : 'No pages';
+				self.list.append(dom.h3().text(msg));
 				return;
 			}
 			$.each(generation, function(boxname, pages) {
 				pages.sort(slugComparator);
-				var box = dom.div(".box").append(dom.h4().text(boxname));
+				var box = dom.div('.box').append(dom.h4().text(boxname));
 				for (var i = 0, ii = pages.length; i < ii; i++) {
-					var p = pages[i], page = dom.div(".page").text(p.slug).data('page', p);
+					var p = pages[i], page = dom.div('.page').text(p.slug).data('page', p);
 					if (origin && p.id === origin.id) {
-						page.addClass("current");
+						page.addClass('current');
 					}
 					page.click(load_page(p));
 					box.append(page);
@@ -156,21 +159,26 @@ Spontaneous.TopBar = (function($, S) {
 			return S.site_domain;
 		},
 		element: function() {
-			var self = this, li = dom.li('.root');
+			var self = this, li = dom.li('.root-node');
 			var link = dom.a({'href': this.url}).text(this.title).data('page', this.page);
 			if (Object.keys(this.roots.roots).length === 1) {
-				li.addClass("singluar");
+				li.addClass('singluar');
 			} else {
 				li.click(function(event) {
 					var browser = new RootBrowser(self.roots);
 					Spontaneous.Popover.open(event, browser);
 				});
 			}
-			link.click(function() {
-				var page = $(this).data('page');
-				S.Location.load_id(page.id);
-				return false;
-			});
+			var loaded = S.Location.get('location')
+			, active = (loaded.id == this.page.id) // active == true represents the state where the currently shown page is this node
+			;
+			if (!active) {
+				link.click(function() {
+					var page = $(this).data('page');
+					S.Location.load_id(page.id);
+					return false;
+				});
+			}
 			disableParent(link);
 			li.append(link);
 			this.link = link;
@@ -189,7 +197,7 @@ Spontaneous.TopBar = (function($, S) {
 	};
 	AncestorNode.prototype = {
 		element: function() {
-			var page = this.page, li = dom.li(), link = $('<a/>').data('page', page).click(function() {
+			var page = this.page, li = dom.li('.ancestor-node'), link = $('<a/>').data('page', page).click(function() {
 				var page = $(this).data('page');
 				S.Location.load_id(page.id);
 				return false;
@@ -198,9 +206,11 @@ Spontaneous.TopBar = (function($, S) {
 			disableParent(link);
 			li.append(link);
 
-			li.click(function() {
+			li.click(function(e) {
 				var browser = new PageBrowser(page);
-				Spontaneous.Popover.open(event, browser);
+				Spontaneous.Popover.open(e, browser);
+				e.preventDefault();
+				return false;
 			});
 
 			return li;
@@ -218,11 +228,12 @@ Spontaneous.TopBar = (function($, S) {
 	CurrentNode.prototype = {
 		element: function() {
 			var self = this
-			, li = dom.li()
+, li = dom.li('.current-node')
 			, link = dom.a().text(self.title);
 			li.click(function(event) {
 				var browser = new PageBrowser(self.page, self.pages);
 				Spontaneous.Popover.open(event, browser);
+				return false;
 			});
 			li.append(link);
 			this.title_element = link;
@@ -246,6 +257,7 @@ Spontaneous.TopBar = (function($, S) {
 			li.click(function(event) {
 				var browser = new PageBrowser(self.origin, self.children());
 				Spontaneous.Popover.open(event, browser);
+				return false;
 			});
 			return li;
 		}.cache(),
@@ -255,7 +267,7 @@ Spontaneous.TopBar = (function($, S) {
 			for (var boxname in children) {
 				if (children.hasOwnProperty(boxname)) {
 					for (var i = 0, box = children[boxname], ii = box.length; i < ii; ++i) {
-						block(box[i])
+						block(box[i]);
 					}
 				}
 			}
@@ -282,10 +294,10 @@ Spontaneous.TopBar = (function($, S) {
 		},
 		add_page: function(page, position) {
 			var self = this
-			, container = page.container
-			, name = container.name()
+, container = page.container
+, name = container.name()
 			, children = self.origin.children
-			, box = children[name];
+, box = children[name];
 
 			if (!box) {
 				box = [];
@@ -305,8 +317,8 @@ Spontaneous.TopBar = (function($, S) {
 
 		remove_page: function(page) {
 			var self = this
-			, children = self.origin.children
-			, container = page.container.name()
+, children = self.origin.children
+, container = page.container.name()
 			, page_id = page.id()
 			, index = (function(children) {
 				for (var boxname in children) {
@@ -338,7 +350,7 @@ Spontaneous.TopBar = (function($, S) {
 		user_loaded: function(user) {
 			if (user.can_publish()) {
 				this.disabled = false;
-				this.button().removeClass("disabled").fadeIn();
+				this.button().removeClass('disabled').velocity('fadeIn');
 			}
 		},
 		update_status: function(status) {
@@ -352,7 +364,7 @@ Spontaneous.TopBar = (function($, S) {
 					this.in_progress = false;
 					this.progress().stop();
 					// this.set_interval(this.normal_check);
-					this.set_label("Publish");
+					this.set_label('Publish');
 					this.button().switchClass('progress', '');
 					this.current_action = this.current_progress = null;
 				// }
@@ -362,11 +374,11 @@ Spontaneous.TopBar = (function($, S) {
 			} else {
 				this.publishing_state();
 				// don't turn off intermediate and replace it with an empty progress dial
-				// by making sure our progress is > 0 before switching to progress view
-				if ((progress !== "*")) {
-					this.progress().update(progress);
-				} else {
+				// by making sure our progress is > 1 before switching to progress view
+				if ((progress === '*') || (progress < 1.0)) {
 					this.progress().indeterminate();
+				} else {
+					this.progress().update(progress);
 				}
 			}
 		},
@@ -376,7 +388,7 @@ Spontaneous.TopBar = (function($, S) {
 		},
 		publishing_state: function() {
 			// this.set_interval(this.rapid_check);
-			this.set_label("Publishing");
+			this.set_label('Publishing');
 			var b = this.button();
 			this.current_action = this.current_progress = null;
 			if (!b.hasClass('progress')) { b.switchClass('', 'progress'); }
@@ -393,7 +405,7 @@ Spontaneous.TopBar = (function($, S) {
 				this._progress_container = dom.span('#publish-progress');
 				this._label = dom.span();
 				this._button = dom.a('#open-publish.disabled').append(this._progress_container).append(this._label).hide();
-				this.set_label("Publish");
+				this.set_label('Publish');
 				this._button.click(function() {
 					if (!this.disabled && !this.in_progress) {
 						S.Publishing.open_dialogue();
@@ -426,25 +438,25 @@ Spontaneous.TopBar = (function($, S) {
 	});
 
 	var CMSNavigationView = new JS.Class({
-		initialize: function() {
-
+		initialize: function(topBar) {
+			this.topBar = topBar;
 		},
 		panel: function() {
 			var self = this;
 			if (!self.wrap) {
-				self.wrap = dom.div("#cms-navigation-view");
+				self.wrap = dom.div('#cms-navigation-view');
 				self.location = dom.ul('#navigation');
 				self.mode_switch = dom.a('#switch-mode').
 					text(S.TopBar.opposite_mode(S.ContentArea.mode)).
 					click(function() {
-						S.TopBar.toggle_modes();
+						S.TopBar.toggle_modes(self.previewModeDisabled);
 					});
 
 				self.publish_button = new PublishButton();
 				self.wrap.append(self.location);
 				self.wrap.append(self.publish_button.button());
 				self.wrap.append(self.mode_switch);
-				S.User.watch("user", function(user) { self.publish_button.user_loaded(user);  });
+				S.User.watch('user', function(user) { self.publish_button.user_loaded(user); });
 			}
 			return self.wrap;
 		},
@@ -456,6 +468,22 @@ Spontaneous.TopBar = (function($, S) {
 			var children_node = new ChildrenNode(location);
 			self.location.append(children_node.element());
 			self.children_node = children_node;
+			self.updateModeCompatibility(location);
+		},
+		updateModeCompatibility: function(location) {
+			var self = this;
+			if (location.private) {
+				self.previewModeDisabled = true;
+				self.mode_switch.addClass('disabled');
+			} else {
+				self.previewModeDisabled = false;
+				self.mode_switch.removeClass('disabled');
+			}
+			if (self.previewModeDisabled) {
+				this.topBar.set_mode('edit');
+			} else {
+
+			}
 		},
 		page_loaded: function(page) {
 			var self = this, children_node = self.children_node;
@@ -539,9 +567,9 @@ Spontaneous.TopBar = (function($, S) {
 		},
 		panel: function() {
 			var self = this;
-			this.wrap = dom.div("#service-navigation");
+			this.wrap = dom.div('#service-navigation');
 			var title = dom.h2().text(this.service.title);
-			var close = dom.a(".button").text("Close").click(function() {
+			var close = dom.a('.button').text('Close').click(function() {
 				S.Services.close();
 			});
 			this.wrap.append(title, close);
@@ -550,23 +578,23 @@ Spontaneous.TopBar = (function($, S) {
 	});
 	var TopBar = new JS.Singleton({
 		include: Spontaneous.Properties,
-		location: "/",
+		location: '/',
 		panel: function() {
 			this.wrap = dom.div('#top');
 			// this.icon = dom.div('#spontaneous-root');
 			this.icon = this.rootMenu();
 			this.holder = dom.div('#service-outer');
-			this.navigationView = new CMSNavigationView();
-			this.serviceStation = dom.div("#service-inner");
+			this.navigationView = new CMSNavigationView(this);
+			this.serviceStation = dom.div('#service-inner');
 			this.holder.append(this.navigationView.panel(), this.serviceStation);
 			this.wrap.append(this.icon, this.holder);
 			return this.wrap;
 		},
 		rootMenu: function() {
 			var li = dom.div('#spontaneous-root').click(function(event) {
-				$(this).addClass("active"); // no easy way to remove this
+				$(this).addClass('active'); // no easy way to remove this
 				Spontaneous.Popover.open(event, new Spontaneous.RootMenuView(function() {
-					li.removeClass("active");
+					li.removeClass('active');
 				}));
 			});
 			return li.append(dom.span());
@@ -575,7 +603,7 @@ Spontaneous.TopBar = (function($, S) {
 			if (!this.get('mode')) {
 				this.set('mode', S.ContentArea.mode);
 			}
-			this.navigationView.roots(metadata.roots)
+			this.navigationView.roots(metadata.roots);
 			S.Editing.watch('page', this.page_loaded.bind(this));
 			S.Location.watch('location', this.location_loaded.bind(this));
 		},
@@ -601,8 +629,12 @@ Spontaneous.TopBar = (function($, S) {
 			this.page_loaded = function(page) {
 			};
 		},
-		toggle_modes: function() {
-			this.set_mode(this.opposite_mode(this.get('mode')));
+		toggle_modes: function(previewModeDisabled) {
+			var newMode = this.opposite_mode(this.get('mode'));
+			if (previewModeDisabled && newMode === 'preview') {
+				return;
+			}
+			this.set_mode(newMode);
 		},
 		opposite_mode: function(to_mode) {
 			if (to_mode === 'preview') {