bhf 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1366b2ceb6e65bcd2a739f3521e555bf9f6a036d
-  data.tar.gz: 27dbc45a52a99f8836128b1560f939f65043fba8
+  metadata.gz: 4cc6b87836fe806140e022b27025867fbdffa363
+  data.tar.gz: ac24ced7f99b1cd4ddd2307f22e56021c9d248df
 SHA512:
-  metadata.gz: 49b9b8d0b83fa398b7f1d2906e783170606f930fee4ce284d6b31366f6419563c6e9e171a4b41cc0744f335631058725353511135d25bbad4e587e43c7b6df76
-  data.tar.gz: d59d1a6b9b2c019a352748b91f64b7a90273ff155c854ec4586f3e22a4566293c0dc54c5dedf94f100f9eb2cf9675d7000e3daf4588ed31f3f7bc55b8654a7e3
+  metadata.gz: 3569c76fb5640ab31921d2443ab04deab1b9b5764c5e3336f47f9b38f569744c020a627804c5504291b537591907cc3540e3dc54dd9fa018901d052d52e67428
+  data.tar.gz: e6bbc281d695181e7d4d6afc7ec7cfb86f52434bbc5cc211bd50f67284c8521ccbc51364b1feedbc10ad211e0bd2fa7a23cc17e820fa96560768e84efa0ed038

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',        '~> 4.1.1'
+gem 'rails',        '~> 4'
 gem 'turbolinks',   '~> 2.1'
 gem 'kaminari',     '~> 0.15'
 gem 'haml-rails',   '~> 0.4'

data/Gemfile.lock

@@ -162,7 +162,7 @@ DEPENDENCIES
   haml-rails (~> 0.4)
   jeweler (~> 2.0)
   kaminari (~> 0.15)
-  rails (~> 4.1.1)
+  rails (~> 4)
   rdoc (~> 3.12)
   sass-rails (~> 4.0)
   shoulda (~> 3.5)

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.2

data/app/assets/javascripts/bhf/application.js

@@ -4,6 +4,9 @@
 //= require ./mootools_ujs
 //= require_tree ./classes/
 
+// Turbolinks bugs out on popState if you add own pushState events, so we cancel it
+Turbolinks.pagesCached(0);
+
 var initHelper = function(callback){
 	var scopedCallback = function(){
 		callback(document.body);
@@ -11,8 +14,7 @@ var initHelper = function(callback){
 	document.addEventListener('page:load', scopedCallback);
 	window.addEvent('domready', scopedCallback);
 	window.addEvent('platformUpdate', callback);
-	window.addEvent('quickEditReady', callback);
-	window.addEvent('newQuickEditLink', callback);
+	window.addEvent('quickEditFormInject', callback);
 };
 
 (function(){
@@ -25,44 +27,101 @@ var initHelper = function(callback){
 		ajaxNote.loading();
 	});
 
-	var editStack = new AjaxEditStack();
-	
-	var insertNewLi = function(relation, json){
-		var elems = [];
-		if (json.can_edit) {
-			elems.push(new Element('a.quick_edit', {text: json.to_bhf_s || '', href: json.edit_path}));
+	var editStack = new QuickEditStack({
+		permanentQuickEditEvents: {
+			startRequest: function(){
+				var linkElem = this.linkElem;
+				var rowElem = this.linkElem.getParent('tr');
+				if (rowElem) {
+					linkElem = rowElem;
+				}
+				linkElem.addClass('live_edit');
+			},
+			closed: function(){
+				var linkElem = this.linkElem;
+				var rowElem = this.linkElem.getParent('tr');
+				if (rowElem) {
+					linkElem = rowElem;
+				}
+				linkElem.addClass('animate');
+				setTimeout(function(){
+					linkElem.removeClass('live_edit');
+				});
+				setTimeout(function(){
+					linkElem.removeClass('animate');
+				}, 600);
+			}
 		}
-		else {
-			elems.push(new Element('a', {text: json.to_bhf_s}));
+	});
+			
+	var triggerPlatformPagination = function(href, platform, callback){
+		window.history.pushState({ turbolinks: true, url: href }, '', href);
+		ajaxNote.loading();
+		new Request.HTML({
+			method: 'get',
+			url: href,
+			onFailure: function(){
+				ajaxNote.failure();
+			},
+			onSuccess: function(a, b, html){
+				platform.innerHTML = html;
+				if (callback) {
+					callback.call();
+				}
+				window.fireEvent('platformUpdate', [platform.getParent()]);
+			}
+		}).send();
+	};
+
+	var updateElementsAfterQuickEditSuccess = function(eventNames, linkElem, json){
+		var parent = linkElem.getParent('.quick_edit_block');
+		var entryTemplate = parent.getElement('.quick_edit_template');
+		var newEntryInjectArea = parent.getElement('.quick_edit_inject');
+		var relation = parent.getElement('.relation');
+		var entry = linkElem.getParent('.quick_edit_entry');
+		if ( ! entry) {
+			entry = parent.getElement('.quick_edit_active');
 		}
-		if (json.can_delete) {
-			elems.push(new Element('a.delete', {html: '×' || '', href: json.delete_path, 'data-confirm': json.delete_confirm, 'data-remote': 'true'}))
+		
+		if (json) {
+			var parsedTemplate = entryTemplate.innerHTML.replace(new RegExp('%7Bobject_id%7D', 'g'), '{object_id}').substitute(json)
 		}
-		var newLi = new Element('li').adopt(elems);
-		relation.adopt(newLi);
-		window.fireEvent('newQuickEditLink', [newLi]);
-	}
-	var setupDefaultDeleteQuickEditEvents = function(scope, options){		
-		scope.addEvent('click:relay(.delete)', function(e){
-			e.target.addEvents({
-				'ajax:success': function(html){
-					var relation = e.target.getParent('.relation');
-					if (relation.getElements('li').length < 2) {
-						relation.getPrevious('.empty').removeClass('hide');
-						if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
-							relation.getNext('.add_field').removeClass('hide');
-						}
-					}
-					e.target.getParent('li').dispose();
-				},
-				'ajax:failure': function(html){
-					alert(Locale.get('Notifications.failure'));
+		
+		if (eventNames.contains('successAndAdd')) {
+			if (newEntryInjectArea && entryTemplate) {
+				newEntryInjectArea.appendHTML(parsedTemplate);
+				if (newEntryInjectArea) {
+					newEntryInjectArea.fireEvent('quickEditEntryAdded');
 				}
-			});
-		});
-	}
+			}
+			
+			if (relation) {
+				if (relation.getPrevious('.empty')) {
+					relation.getPrevious('.empty').addClass('hide');
+				}
+				if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
+					relation.getNext('.js_add_field').addClass('hide');
+				}
+			}
+		}
+		if (eventNames.contains('successAndChange')) {
+			if (entry) {
+				entry.innerHTML = parsedTemplate;
+			}
+		}
+		if (eventNames.contains('successAndRemove')) {
+			if (entry) {
+				entry.dispose();
+			}
+			if (newEntryInjectArea) {
+				newEntryInjectArea.fireEvent('quickEditEntryRemoved');
+			}
+			
+		}
+	};
 	
 	initHelper(function(mainScope){
+		
 		var areaSelect = mainScope.getElement('#area_select');
 		if (areaSelect) {
 			areaSelect.addEvent('change', function(){
@@ -71,18 +130,16 @@ var initHelper = function(callback){
 		}
 		
 		var quickEditArray = [];
-		var ajaxEditOptions;
+		var quickEditOptions;
 		
 		ajaxNote.setup();
 
-		rails.applyEvents(mainScope);
-		
 		var jsForm = new FormHelper();
 		mainScope.getElements('.js_bhf_form').each(function(form){
 			jsForm.setup(form);
 		});
 		
-		var sharedAjaxEditOptions = {
+		var sharedQuickEditOptions = {
 			onFailure: function(){
 				ajaxNote.failure();
 			},
@@ -93,7 +150,8 @@ var initHelper = function(callback){
 				scrollContent();
 				ajaxNote.success();
 			},
-			onSave: function(form){
+			onSave: function(eventNames, linkElem, json){
+				updateElementsAfterQuickEditSuccess(eventNames, linkElem, json);
 				ajaxNote.success();
 			},
 			onBeforeSubmit: function(){
@@ -106,39 +164,63 @@ var initHelper = function(callback){
 
 		var platforms = mainScope.getElements('.platform');
 		var mainForm = mainScope.getElementById('main_form');
+		
+		mainScope.getElements('.quick_edit_select').addEvent('change', function(e){
+			var parent = this.getParent('.quick_edit_block');
+			var optionElem = this.options[this.selectedIndex];
+			var editElem = parent.getElement('.js_edit_field');
+			if (editElem) {
+				editElem.href = optionElem.get('data-edit');
+			}
+			var deleteElem = parent.getElement('.js_delete');
+			if (deleteElem) {
+				deleteElem.href = optionElem.get('data-delete');
+			}
+			this.getElements('.quick_edit_active').removeClass('quick_edit_active');
+			optionElem.addClass('quick_edit_active');
+		}).addEvent('quickEditEntryAdded', function(){
+			this.selectedIndex = this.options.length - 1;
+			this.fireEvent('change');
+		}).addEvent('quickEditEntryRemoved', function(){
+			this.selectedIndex = 0;
+			this.fireEvent('change');
+		}).fireEvent('change');
+		
+		mainScope.addEvent('click:relay(.js_delete)', function(e){
+			e.target.addEvents({
+				'ajax:success': function(html){
+					updateElementsAfterQuickEditSuccess(['successAndRemove'], e.target);
+				},
+				'ajax:failure': function(html){
+					alert(Locale.get('Notifications.failure'));
+				}
+			});
+		});
+		
 
 		if (platforms.length) {
-			ajaxEditOptions = Object.merge({
-				onSuccessAndChange: function(json){
-					var tr = this.wrapElement;
-					tr.getElements('td').each(function(td){
-						var name = td.get('data-column-name');
-						if ( ! name) { return; }
-						var a = td.getElement('a.quick_edit');
-						(a ? a : td).innerHTML = json[name] || '';
-					});
-				},
+			quickEditOptions = Object.merge({
 				onSuccessAndNext: function(json){
-					var tr = this.wrapElement;
+					var tr = this.linkElem;
 					var qe;
 					var nextTr = tr.getNext('tr');
 
 					if (nextTr) {
 						editStack.removeAllStacks();
-						editStack.addEditBrick(ajaxEditOptions, nextTr.getElement('a'), nextTr);
+						editStack.addEditBrick(quickEditOptions, nextTr.getElement('a'), nextTr);
 					}
 					else {
 						var platform = tr.getParent('.platform');
 						var loadMore = platform.getElement('.load_more');
 						if (loadMore) {
 							trIndex = tr.getParent('tbody').getElements('tr').indexOf(tr);
-							updatePlatform(loadMore.get('href'), platform, function(){
+							triggerPlatformPagination(loadMore.get('href'), platform, function(){
 								platform.getElements('tbody tr').each(function(newTr, index){
 									if (trIndex === index) {
 										nextTr = newTr.getNext('tr');
 										
 										editStack.removeAllStacks();
-										editStack.addEditBrick(ajaxEditOptions, nextTr.getElement('a'), nextTr);
+										editStack.addEditBrick(quickEditOptions, nextTr.getElement('a'), nextTr);
 									}
 								});
 							});
@@ -147,39 +229,21 @@ var initHelper = function(callback){
 							nextTr = platform.getElements('tbody tr')[0];
 							
 							editStack.removeAllStacks();
-							editStack.addEditBrick(ajaxEditOptions, nextTr.getElement('a'), nextTr);
+							editStack.addEditBrick(quickEditOptions, nextTr.getElement('a'), nextTr);
 						}
 					}
 				}
-			}, sharedAjaxEditOptions);
+			}, sharedQuickEditOptions);
 			
-			
-			var updatePlatform = function(href, platform, callback){
-				ajaxNote.loading();
-				new Request.HTML({
-					method: 'get',
-					url: href,
-					onFailure: function(){
-						ajaxNote.failure();
-					},
-					onSuccess: function(a, b, html){
-						platform.innerHTML = html;
-						if (callback) {
-							callback.call();
-						}
-						window.fireEvent('platformUpdate', [platform.getParent()]);
-					}
-				}).send();
-			};
 
 			platforms.each(function(p){
 				new PlatformHelper(p, {
 					onPaginationStart: function(link){
-						updatePlatform(link.get('href'), link.getParent('.platform'));
+						triggerPlatformPagination(link.get('href'), link.getParent('.platform'));
 					},
 					onQuickEditStart: function(link){
 						editStack.removeAllStacks();
-						editStack.addEditBrick(ajaxEditOptions, link, link.getParent('tr'));
+						editStack.addEditBrick(quickEditOptions, link, link.getParent('tr'));
 					},
 					onSearch: function(){
 						ajaxNote.loading();
@@ -187,95 +251,68 @@ var initHelper = function(callback){
 					onSearchFailure: function(){
 						ajaxNote.failure();
 					},
-					onSearchSuccess: function(){
+					onSearchSuccess: function(request){
 						window.fireEvent('platformUpdate', [p.getParent()]);
+						// TODO: remove the mootools hack for request.url don't 
+						window.history.pushState({ turbolinks: true, url: request.url }, '', request.url);
 					}
 				});
 			});
 		}
 		else if (mainForm) {
-			ajaxEditOptions = Object.merge({
-				onSuccessAndAdd: function(json){
-					var relation = this.wrapElement.getPrevious('.relation');
-					relation.getPrevious('.empty').addClass('hide');
-					if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
-						relation.getNext('.add_field').addClass('hide');
-					}
-					insertNewLi(relation, json);
-				},
-				onSuccessAndChange: function(json){
-					this.wrapElement.set('text', json.to_bhf_s || '');
-				},
+			quickEditOptions = Object.merge({
 				onSuccessAndNext: function(json){
-					var a = this.wrapElement;
+					var a = this.linkElem;
 					var li = a.getParent('li');
 					if ( ! li) { 
 						this.close();
 						return;
 					}
 					var holder = li.getNext('li');
-
 					if ( ! holder) {
 						holder = li.getParent('ul');
 					}
 					
 					editStack.removeAllStacks();
-					editStack.addEditBrick(ajaxEditOptions, holder.getElement('a'));
+					editStack.addEditBrick(quickEditOptions, holder.getElement('a'));
 				}
-			}, sharedAjaxEditOptions);
+			}, sharedQuickEditOptions);
 			
-			setupDefaultDeleteQuickEditEvents(mainForm, ajaxEditOptions);
 			mainForm.addEvent('click:relay(.quick_edit)', function(e){
 				e.preventDefault();
 				editStack.removeAllStacks();
-				editStack.addEditBrick(ajaxEditOptions, this);
+				editStack.addEditBrick(quickEditOptions, this);
 			});
 		}
 		else if (mainScope.hasClass('quick_edit_holder')) {
-			ajaxEditOptions = Object.merge({
-				onSuccessAndAdd: function(json){
-					var relation = this.wrapElement.getPrevious('.relation');
-					relation.getPrevious('.empty').addClass('hide');
-					if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
-						relation.getNext('.add_field').addClass('hide');
-					}
-					insertNewLi(relation, json);
-				},
-				onSuccessAndChange: function(json){
-					this.wrapElement.set('text', json.to_bhf_s || '');
-				},
+			quickEditOptions = Object.merge({
 				onClosed: function(){
 					editStack.removeStack();
 				},
 				hideNext: true
-			}, sharedAjaxEditOptions);
+			}, sharedQuickEditOptions);
 			
-			setupDefaultDeleteQuickEditEvents(mainScope, ajaxEditOptions);
 			mainScope.addEvent('click:relay(.quick_edit)', function(e){
 				e.preventDefault();
 				editStack.addStack();
-				editStack.addEditBrick(ajaxEditOptions, this);
+				editStack.addEditBrick(quickEditOptions, this);
 			});
 		}
 		
 		
-		var windowHight = document.body.clientHeight;
-		window.onresize = function(e){
-			windowHight = document.body.clientHeight;
-		};
 		var scrollContent = function(){
 			quickEditArray.each(function(quickEdit){
 				var innerForm = quickEdit.holder.getElement('form');
 				if ( ! innerForm) { return; }
 				var scroll = document.body.scrollTop - 83;
-				if (scroll + innerForm.getSize().y > windowHight) { return; }
+				if (scroll + innerForm.getSize().y > document.body.clientHeight) { return; }
 				quickEdit.holder.setStyle('padding-top', scroll);
 			});
 		};
 		// window.onscroll = scrollContent;
 		
 		
-		mainScope.getElements('.sortable').each(function(sortableElems){
+		mainScope.getElements('.js_sortable').each(function(sortableElems){
 			new Sortables(sortableElems, {
 				handle: '.handle',
 				onStart: function(element, clone){
@@ -285,7 +322,7 @@ var initHelper = function(callback){
 					element.removeClass('dragged');
 					new Request({
 						method: 'put',
-						url: this.element.getParent('tbody').get('data-sort-url')
+						url: sortableElems.get('data-sort-url')
 					}).send({data: {order: this.serialize()}});
 				}
 			});