From 1ae9557515acfa07ba6686aff9ec04a2b2752920 Mon Sep 17 00:00:00 2001
From: Didier Lafforgue <didier@nocoffee.fr>
Date: Sat, 14 Apr 2012 13:38:47 +0200
Subject: [PATCH] back to the original editable_short_text (#349)

---
 .../locomotive/models/page.js.coffee          |  2 +-
 .../long_text_view.js.coffee                  | 32 +++++++++++++++++--
 .../short_text_view.js.coffee                 | 26 ++++-----------
 .../backoffice/formtastic_changes.css.scss    | 11 +++++++
 4 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/locomotive/models/page.js.coffee b/app/assets/javascripts/locomotive/models/page.js.coffee
index 4ff2cde1..dd68be3d 100644
--- a/app/assets/javascripts/locomotive/models/page.js.coffee
+++ b/app/assets/javascripts/locomotive/models/page.js.coffee
@@ -16,7 +16,7 @@ class Locomotive.Models.Page extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
-      _.each ['content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (key) => delete hash[key]
+      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (key) => delete hash[key]
 
       delete hash['editable_elements']
       hash.editable_elements = @get('editable_elements').toJSONForSave() if @get('editable_elements')? && @get('editable_elements').length > 0
diff --git a/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee b/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee
index 5c0e9925..86147c12 100644
--- a/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee
+++ b/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee
@@ -2,7 +2,35 @@
 
 Locomotive.Views.EditableElements ||= {}
 
-class Locomotive.Views.EditableElements.LongTextView extends Locomotive.Views.EditableElements.ShortTextView
+class Locomotive.Views.EditableElements.LongTextView extends Backbone.View
+
+  tagName: 'li'
+
+  className: 'text input html'
+
+  render: ->
+    $(@el).html(ich.editable_text_input(@model.toJSON()))
+
+    return @
+
+  after_render: ->
+    settings = _.extend {}, @tinymce_settings(),
+      oninit: ((editor) =>
+        $.cmd 'S', (() =>
+          @model.set(content: editor.getBody().innerHTML)
+          $(@el).parents('form').trigger('submit')
+        ), [], ignoreCase: true, document: editor.dom.doc),
+      onchange_callback: (editor) =>
+        @model.set(content: editor.getBody().innerHTML)
+
+    @$('textarea').tinymce(settings)
 
   tinymce_settings: ->
-    window.Locomotive.tinyMCE.defaultSettings
\ No newline at end of file
+    window.Locomotive.tinyMCE.defaultSettings
+
+  refresh: ->
+    # do nothing
+
+  remove: ->
+    @$('textarea').tinymce().destroy()
+    super
diff --git a/app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee b/app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee
index 4c5a5eed..09649c82 100644
--- a/app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee
+++ b/app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee
@@ -4,31 +4,19 @@ class Locomotive.Views.EditableElements.ShortTextView extends Backbone.View
 
   tagName: 'li'
 
-  className: 'text input html'
+  className: 'text input short'
 
   render: ->
     $(@el).html(ich.editable_text_input(@model.toJSON()))
 
+    @$('textarea').bind 'keyup', (event) =>
+      input = $(event.target)
+      @model.set(content: input.val())
+
     return @
 
   after_render: ->
-    settings = _.extend {}, @tinymce_settings(),
-      oninit: ((editor) =>
-        $.cmd 'S', (() =>
-          @model.set(content: editor.getBody().innerHTML)
-          $(@el).parents('form').trigger('submit')
-        ), [], ignoreCase: true, document: editor.dom.doc),
-      onchange_callback: (editor) =>
-        @model.set(content: editor.getBody().innerHTML)
-
-    @$('textarea').tinymce(settings)
-
-  tinymce_settings: ->
-    window.Locomotive.tinyMCE.minimalSettings
-
-  refresh: ->
     # do nothing
 
-  remove: ->
-    @$('textarea').tinymce().destroy()
-    super
\ No newline at end of file
+  refresh: ->
+    # do nothing
\ No newline at end of file
diff --git a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss
index d6137c39..c256b071 100644
--- a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss
+++ b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss
@@ -295,6 +295,17 @@ form.formtastic {
           }
         } // li.string, li.password
 
+        &.text {
+
+          &.short textarea {
+            padding: 5px;
+            height: 28px;
+            width: 696px;
+            overflow-y: hidden;
+          }
+
+        } // li.text
+
         &.locale, &.locales {
           .list {
             margin-left: 150px;