bhf 0.6.25 → 0.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f826ec1cab0c75468cbe892bb70cc694a2cb9622
-  data.tar.gz: dd15052e8817004eca77a99a373b9981a95eed6d
+  metadata.gz: 56521303606559bee75226e7d3402f8fa85a3ccb
+  data.tar.gz: 58d648baa45ae9591ece8d56bf0c3065417e21a7
 SHA512:
-  metadata.gz: a9d417a62b0f4a47d97e3c306d7c51f3b53eaf1178f0e24075831996c3ce60678714e07d604a6bb54f0a824623e3b871ccab4d623fac705f9efee0a8a2bcbc20
-  data.tar.gz: ebcba5e793e609b52b51b1b53a96849180d6e594c554eec566bc5a4cdc126c662753cb86f7d7936a8ed5c728a27c25409f6f678904534af1582097bf613cb67c
+  metadata.gz: 1065d976774a7529233fab6c9166b750b9ead007acc9e3b0ee5d567a93008f4b233edc8efbe51b1a2651f7ba83ee356cfc4225c248ec6343f0216ace7dc7fd99
+  data.tar.gz: d78b57e061c134bf1a561926b054d12833402bbec5e786e8b1b109c78bfcece6dd34300ca98e990df2ce80f4bc835346859df2122e35d1026352e110002bea8c

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

@@ -153,7 +153,7 @@ var initHelper = function(callback){
 		}
 		else if (mainForm) {
 			ajaxEditOptions = Object.merge({
-				successAndAdd: function(json){
+				onSuccessAndAdd: function(json){
 					var relation = this.wrapElement.getPrevious('.relation');
 					relation.getPrevious('.empty').addClass('hide');
 					if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
@@ -165,10 +165,10 @@ var initHelper = function(callback){
 						)
 					);
 				},
-				successAndChange: function(json){
+				onSuccessAndChange: function(json){
 					this.wrapElement.set('text', json.to_bhf_s || '');
 				},
-				successAndNext: function(json){
+				onSuccessAndNext: function(json){
 					var a = this.wrapElement;
 					var li = a.getParent('li');
 					if ( ! li) { 
@@ -212,7 +212,7 @@ var initHelper = function(callback){
 		}
 		else if (mainScope.hasClass('quick_edit_holder')) {
 			ajaxEditOptions = Object.merge({
-				successAndAdd: function(json){
+				onSuccessAndAdd: function(json){
 					var relation = this.wrapElement.getPrevious('.relation');
 					relation.getPrevious('.empty').addClass('hide');
 					if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {

data/app/assets/javascripts/bhf/classes/AjaxEdit.js

@@ -11,7 +11,6 @@ var AjaxEdit = new Class({
 	initialize: function(_options){
 		this.setOptions(_options);
 		this.holder = new Element('div.quick_edit_holder');
-		
 	},
 	
 	startEdit: function(element, wrapElement){

data/app/assets/stylesheets/bhf/application.css.sass

@@ -619,6 +619,8 @@ footer
 
 input[type="submit"],
 .button
+  &.disabled
+    opacity: 0.4
   cursor: pointer
   display: inline-block
   padding: 6px 20px
@@ -644,6 +646,8 @@ input[type="submit"],
 
 input[type="submit"].alt_button,
 .alt_button
+  &.disabled
+    opacity: 0.4
   display: inline-block
   padding: 12px 50px
   +border-radius(4)

data/app/controllers/bhf/embed_entries_controller.rb

@@ -20,7 +20,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
 
       edit_path = edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
       if @quick_edit
-        render json: object_to_display_hash.merge(edit_path: edit_path), status: :ok
+        render json: object_to_bhf_display_hash.merge(edit_path: edit_path), status: :ok
       else
         redirect_back_or_default(edit_path, notice: set_message('create.success', @model))
       end

data/app/controllers/bhf/entries_controller.rb

@@ -132,11 +132,18 @@ class Bhf::EntriesController < Bhf::ApplicationController
         reflection = @model.reflections[relation.to_sym]
 
         next unless ids.any?
+        relation_array = @object.send(relation)
         reflection.klass.unscoped.find(ids.keys).each do |relation_obj|
+          has_relation = relation_array.include?(relation_obj)
+          
           if ids[relation_obj.id.to_s].blank?
-            @object.send(relation).delete(relation_obj)
+            if has_relation
+              relation_array.delete(relation_obj)
+            end
           else
-            @object.send(relation) << relation_obj
+            if ! has_relation
+              relation_array << relation_obj
+            end
           end
         end
       end

data/lib/bhf/mongoid/document.rb

@@ -118,8 +118,8 @@ module Bhf
             parent = parent.find(parent_id) rescue nil
             
             if parent
-              return parent unless block_given?
-              return block.call(parent, meta)
+              return block.call(parent, meta) if block_given?
+              return parent
             end
           end
         end
@@ -131,7 +131,7 @@ module Bhf
             else
               meta.inverse_foreign_key.pluralize
             end.to_s
-            if parent.relations[key_name].macro == :embeds_one
+            if parent.relations[key_name] and parent.relations[key_name].macro == :embeds_one
               parent.send("build_#{key_name}", params)
             else
               parent.send(key_name).build(params)

data/lib/bhf/settings.rb

@@ -10,6 +10,9 @@ module Bhf
           obj << platform.keys.flatten
         end
       end.flatten!
+      if t.nil?
+        raise Exception.new("No Bhf Pages found")
+      end
       if t.uniq.length != t.length
         raise Exception.new("Platforms with identical names: '#{t.detect{ |e| t.count(e) > 1 }}'")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.25
+  version: 0.6.26
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails