phrasing 4.0.0rc4 → 4.0.0rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec5cf82a1f8789b4f8c7f25f1fd93ec9c370ded
-  data.tar.gz: 9d92db89baa70f2adf1fd122ced6cb949ee4e44e
+  metadata.gz: 7b0757a83e101496cafb49039b3ab1efe078014d
+  data.tar.gz: 66fa7004242054c8bf4525a869aaa26b09cf6140
 SHA512:
-  metadata.gz: 1ab0220b8ad7cf33ec522ba8155d2aeb65ffed693bb2c4eed8a8ce736efc0ae8b96d859618829092b6c3a6984dd4a13affe8cc9935fafc199f08ea3f9afd717b
-  data.tar.gz: 61f3907edde2443d5b50f050f01edfec95f258614601aebc3d77e02db8795868a6067b4e17e7ab6318cf7ce9436dd666271e80edcf7812b9bf470261d40b9197
+  metadata.gz: eacb10e6cb2bc6267a399429b112e67eacfcd55f7a194a50c6e334831950595ea66c90a9d108c4b5e65f5451112cc89baab9316b23506316abb6e8cf187fc184
+  data.tar.gz: 8eb444d1fe8d14a634aaf0b1b3b0519f9c3a669b959aa1885573bd0da787c8d199f1738c7a58ad574f039468e9d134f88dcc31341d18a16f917d2ef9b2fc8ddb

data/app/assets/javascripts/editor.js

@@ -36,7 +36,7 @@ var editor = (function() {
 				checkTextHighlighting( event );
 			}, 1);
 		};
-		
+
 		// Window bindings
 		window.addEventListener( 'resize', function( event ) {
 			updateBubblePosition();
@@ -47,15 +47,15 @@ var editor = (function() {
 		// http://ejohn.org/blog/learning-from-twitter
 		var scrollEnabled = true;
 		document.body.addEventListener( 'scroll', function() {
-			
+
 			if ( !scrollEnabled ) {
 				return;
 			}
-			
+
 			scrollEnabled = true;
-			
+
 			updateBubblePosition();
-			
+
 			return setTimeout((function() {
 				scrollEnabled = true;
 			}), 250);
@@ -100,7 +100,7 @@ var editor = (function() {
 			if (event.target.parentNode.classList.contains("ui-inputs")){
 				currentNodeList = findNodes( selection.focusNode );
 				updateBubbleStates();
-				return;				
+				return;
 			}
 		}
 
@@ -125,12 +125,12 @@ var editor = (function() {
 
 		lastType = selection.isCollapsed;
 	}
-	
+
 	function updateBubblePosition() {
 		var selection = window.getSelection();
 		var range = selection.getRangeAt(0);
 		var boundary = range.getBoundingClientRect();
-		
+
 		textOptions.style.top = boundary.top - 5 + window.pageYOffset + "px";
 		textOptions.style.left = (boundary.left + boundary.right)/2 + "px";
 	}
@@ -201,7 +201,7 @@ var editor = (function() {
 		//if any of its parents has the class of 'phrasable' go hooray
 		while ( element.parentNode ) {
 			if (element.className !== undefined){
-				if (element.className.indexOf("phrasable_on")>=0){
+				if (element.className.indexOf("phrasable-on")>=0){
 					return true;
 				}
 			}
@@ -307,4 +307,4 @@ var editor = (function() {
 		init: init
 	}
 
-})();
+})();

data/app/assets/javascripts/phrasing.js

@@ -5,6 +5,10 @@ var Phrasing = {
   EDIT_MODE_KEY : 'editing-mode'
 };
 
+Phrasing.isEditModeEnabled = function(){
+  return localStorage.getItem(this.EDIT_MODE_KEY) === "true";
+};
+
 function StatusBubbleWidget(options){
   this.$statusText       = options.$statusText;
   this.$statusIndicator  = options.$statusIndicator;

data/app/helpers/inline_helper.rb

@@ -20,12 +20,12 @@ module InlineHelper
     return uneditable_phrase(record, attribute) unless can_edit_phrases?
 
     klass  = 'phrasable'
-    klass += ' inverse'      if options[:inverse]
-    klass += options[:class] if options[:class]
+    klass += ' inverse' if options[:inverse]
+    klass += ' ' + options[:class] if options[:class]
 
     url = phrasing_polymorphic_url(record, attribute)
 
-    content_tag(:span, class: klass, contenteditable: true, spellcheck: false, 'data-url' => url) do
+    content_tag(:span, class: klass, spellcheck: false, 'data-url' => url) do
       (record.send(attribute) || record.try(:key)).to_s.html_safe
     end
   end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc4"
+  VERSION = "4.0.0rc5"
 end

data/spec/features/phrasing_spec.rb

@@ -14,10 +14,10 @@ feature 'edit mode bubble' do
     expect(edit_mode_checkbox).not_to be_checked
   end
 
-  it "phrases should have class 'phrasable_on' and contenteditable=true" do
+  it "phrases initially shouldn't have class 'phrasable-on' and contenteditable=true" do
     expect(page.find('.header').first('.phrasable').text).to eq 'The Header'
-    expect(page.find('.header').first('.phrasable')['class']).to eq 'phrasable phrasable_on'
-    expect(page.find('.header').first('.phrasable')['contenteditable']).to eq 'true'
+    expect(page.find('.header').first('.phrasable')['class']).to eq 'phrasable'
+    expect(page.find('.header').first('.phrasable')['contenteditable']).to be_nil
   end
 
   it 'should be able to visit phrasing index via edit_all icon' do
@@ -406,4 +406,4 @@ feature "locales" do
     expect(yaml).to match(/es:\s*hello: mundo/)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc4
+  version: 4.0.0rc5
 platform: ruby
 authors:
 - Tomislav Car