phrasing 2.1.1 → 2.1.2

data/app/assets/javascripts/phrasing.js.erb

@@ -34,13 +34,13 @@ var phrasing_setup = function(){
 
 // Hash size function
 
-Object.size = function(obj) {
-    var size = 0, key;
-    for (key in obj) {
-        if (obj.hasOwnProperty(key)) size++;
-    }
-    return size;
-};
+  Object.size = function(obj) {
+      var size = 0, key;
+      for (key in obj) {
+          if (obj.hasOwnProperty(key)) size++;
+      }
+      return size;
+  };
 
 
 
@@ -92,7 +92,7 @@ Object.size = function(obj) {
       success: function(e){
         spinner.stop();
 
-        console.log("I've sent a ajax request: " + content);
+        // console.log("I've sent a ajax request: " + content);
 
         trigger_binded_events_for_phrasable_class = 0;
         if(content == "Empty"){
@@ -105,7 +105,18 @@ Object.size = function(obj) {
         if (Object.size(timer_status) == 0){
           $('#phrasing-edit-mode-bubble #phrasing-spinner p').css("color", "green").text("Everything saved.")
         }
-      }})
+      },
+      error: function(e){
+        spinner.stop();
+        var warningMessages = [e.responseText, "Unable to save!"];
+        var intervalIndex = 0;
+        $('#phrasing-edit-mode-bubble #phrasing-spinner p').css("color", "red").text(warningMessages[1])
+        setInterval(function(){
+          var text = warningMessages[intervalIndex++ % warningMessages.length]
+          $('#phrasing-edit-mode-bubble #phrasing-spinner p').css("color", "red").text(text)
+        },2000);
+      }
+    })
   }
 
 // EDIT MODE SWITCH MODE BUTTON

data/app/controllers/phrasing_phrases_controller.rb

@@ -96,7 +96,7 @@ class PhrasingPhrasesController < ActionController::Base
       @object.save!
       render :json => @object
     else
-      render status: 403, text: "#{klass}.#{attribute} not whitelisted."
+      render status: 403, text: "Attribute not whitelisted!"
     end    
 
     rescue ActiveRecord::RecordInvalid => e

data/lib/phrasing.rb

@@ -19,11 +19,9 @@ module Phrasing
   
   mattr_accessor :allow_update_on_all_models_and_attributes
   mattr_accessor :route
-  mattr_accessor :everything_is_html_safe
   mattr_accessor :staging_server_endpoint
 
   @@route = 'phrasing'
-  @@everything_is_html_safe = false
 
   def self.setup
     yield self
@@ -47,20 +45,4 @@ module Phrasing
     allow_update_on_all_models_and_attributes == true or whitelist.include? "#{klass}.#{attribute}"
   end
 
-end
-
-module ActionView
-  module Helpers
-    module TranslationHelper
-      private
-
-      def new_html_safe_translation_key?(key)
-        Phrasing.everything_is_html_safe || old_html_safe_translation_key?(key)
-      end
-
-      alias_method :old_html_safe_translation_key?, :html_safe_translation_key?
-      alias_method :html_safe_translation_key?, :new_html_safe_translation_key?
-
-    end
-  end
-end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails