locomotivecms 3.0.0.rc6 → 3.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f51bef4ee0791b87690640ed9bac3b70097adf
-  data.tar.gz: 2958657d00470ca1de733eb2bcc838cd86e78e68
+  metadata.gz: 963da1337afd52e192c15d54318e4fd965e62ced
+  data.tar.gz: b72eff93414bb40c7cd300b175538609f8422ab9
 SHA512:
-  metadata.gz: 024727de5fc80100901abf5966edf2964d630edff1bf26162ac94ea30c46d95a4db8a1da23d6a2e6ffa0ad0846ae184ca508eed6d1d44c44316304500f1a8b79
-  data.tar.gz: bebf58fa7965d9528098ae44860dc168870079f1865f68bd3fb13c508919d1af1a2570ff66ddf8a55a56f36136bf8d16e71299a5893916a413d33d8207ed7713
+  metadata.gz: 817d10223d411e2f272e2b3dc289e9a51e6788aa8e1aa5f5cb51ee1433d9298c299bc96b7fdb248f17a2572910c4ad0de0d056efcb464d300ff26df69c1796ac
+  data.tar.gz: e4c2b83ee07b7c81807565ca599dd3961ec48cf0ec69cb81814dd630f02ee66f10dfcb7afc4c6007740ec1679db01a9035af1bfbd9ec6c849ff366e05b879427

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 
 gemspec # Include gemspec dependencies
 
-gem 'sass-rails',   '~> 5.0.1'
+gem 'sass-rails', '~> 5.0.4'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier',     '>= 2.5.3'
 
@@ -22,7 +22,7 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '279c6744eb6b7dd'
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '2e147df', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '939f6f6', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

data/README.md

@@ -80,4 +80,4 @@ For new features (especially large ones) it is best to create a topic on the [Go
 
 Feel free to contact me at did at locomotivecms dot com.
 
-Copyright (c) 2015 NoCoffee, released under the MIT license
+Copyright (c) 2016 NoCoffee, released under the MIT license

data/app/assets/javascripts/locomotive.js

@@ -11,9 +11,9 @@
 //= require underscore/underscore
 //= require backbone/backbone
 //= require bootstrap-tagsinput/bootstrap-tagsinput
+//= require select2/select2
 //= require codemirror
 //= require codemirror/modes/markdown
-//= require select2
 //= require nprogress
 //= require nprogress-ajax
 //= require locomotive/vendor

data/app/assets/javascripts/locomotive/application.js.coffee

@@ -4,5 +4,5 @@
 
 window.Locomotive =
   mounted_on:   window.Locomotive.mounted_on
-  Views:        { CustomFields: {} }
+  Views:        { Sessions: {}, Registrations: {}, Passwords: {}, CustomFields: {}  }
   Flags:        {}

data/app/assets/javascripts/locomotive/utils/file.js.coffee.erb

@@ -0,0 +1,43 @@
+(->
+  window.remote_file_to_base64 = (url, callback) ->
+    xhr = new XMLHttpRequest()
+    xhr.open('GET', url, true)
+    xhr.responseType = 'blob'
+
+    xhr.onload = (event) ->
+      if this.status == 200
+        blob = this.response
+
+        reader = new window.FileReader()
+        reader.readAsDataURL(blob)
+        reader.onloadend = -> callback(reader.result)
+      else
+        callback(null)
+
+    xhr.onerror = (event) -> callback(null)
+
+    xhr.send()
+
+  window.resize_image = (image, format, callback) ->
+    unless format?
+      callback(image)
+      return
+
+    data = new FormData()
+    data.append('image', image)
+    data.append('format', format)
+
+    xhr = new XMLHttpRequest()
+    xhr.open('POST', '<%= Locomotive::Middlewares::ImageThumbnail.route %>', true)
+
+    xhr.onload = (event) ->
+      if this.status == 200
+        callback(this.response)
+      else
+        callback(image)
+
+    xhr.onerror = (event) -> callback(image)
+
+    xhr.send(data)
+
+)()

data/app/assets/javascripts/locomotive/utils/nprogress.js.coffee

@@ -1,7 +1,8 @@
 parent = if $('.content').size() > 0 then '.content' else '.wrapper'
 
-NProgress.configure
-  showSpinner:  false
-  ease:         'ease'
-  speed:        500
-  parent:       parent
+if $(parent).size() > 0
+  NProgress.configure
+    showSpinner:  false
+    ease:         'ease'
+    speed:        500
+    parent:       parent

data/app/assets/javascripts/locomotive/utils/select2.js.coffee

@@ -1,4 +1,4 @@
-Select2.helpers = (->
+window.Select2Helpers = (->
 
   default_build_options = (input) ->
     minimumInputLength:   1
@@ -7,13 +7,15 @@ Select2.helpers = (->
     formatSearching:      input.data('searching')
     formatInputTooShort:  input.data('too-short')
     ajax:
-      url: input.data('list-url')
-      data: (term, page) ->
-        q:    term
-        page: page
-      results: (data, page) ->
-        results:  build_results data, input.data('label-method'), input.data('group-by')
-        more:     data.length == input.data('per-page')
+      url:      input.data('list-url')
+      dataType: 'json'
+      data: (params) ->
+        q:    params.term
+        page: params.page
+      processResults: (data, params) ->
+        results: build_results data, input.data('label-method'), input.data('group-by')
+        pagination:
+          more: data.length == input.data('per-page')
 
   build_results = (raw_data, label_method, group_by) ->
     _.tap [], (list) =>

data/app/assets/javascripts/locomotive/views/application_view.js.coffee

@@ -1,4 +1,6 @@
-class Locomotive.Views.ApplicationView extends Backbone.View
+#= require ./simple_view
+
+class Locomotive.Views.ApplicationView extends Locomotive.Views.SimpleView
 
   el: 'body'
 
@@ -11,7 +13,7 @@ class Locomotive.Views.ApplicationView extends Backbone.View
     @drawer_view  = new Locomotive.Views.Shared.DrawerView()
 
   render: ->
-    @render_flash_messages(@options.flash)
+    super
 
     @sidebar_view.render()
     @drawer_view.render()
@@ -20,20 +22,9 @@ class Locomotive.Views.ApplicationView extends Backbone.View
 
     @automatic_max_height()
 
-    # render page view
-    if @options.view?
-      @view = new @options.view(@options.view_data || {})
-      @view.render()
-
-    return @
-
   slide_sidebar: (event) ->
     $('body').toggleClass('slide-right-sidebar')
 
-  render_flash_messages: (messages) ->
-    _.each messages, (couple) ->
-      Locomotive.notify couple[1], couple[0]
-
   automatic_max_height: ->
     $(window).on 'resize', =>
       height = @set_max_height()

data/app/assets/javascripts/locomotive/views/content_assets/dropzone_view.js.coffee

@@ -11,7 +11,7 @@ class Locomotive.Views.ContentAssets.DropzoneView extends Backbone.View
     'change input[type=file]':  'drop_files'
 
   render: ->
-    console.log '[DropzoneView] rendering'
+    # console.log '[DropzoneView] rendering'
     super
 
   hover: (event) -> @_stop_event(event); $(@el).addClass('hovered')
@@ -26,13 +26,13 @@ class Locomotive.Views.ContentAssets.DropzoneView extends Backbone.View
     , 400
 
   open_file_browser: (event) ->
-    console.log '[DropzoneView] open_file_browser'
+    # console.log '[DropzoneView] open_file_browser'
     @_stop_event(event)
 
     @$('form input[type=file]').trigger('click')
 
   drop_files: (event) ->
-    console.log '[DropzoneView] drop_files'
+    # console.log '[DropzoneView] drop_files'
     @_stop_event(event) & @unhover(event)
 
     form_data = new FormData()

data/app/assets/javascripts/locomotive/views/content_assets/index_view.js.coffee

@@ -23,7 +23,7 @@ class Locomotive.Views.ContentAssets.IndexView extends Backbone.View
     super
 
   open_edit_drawer: (event) ->
-    console.log '[IndexView] open_edit_drawer'
+    # console.log '[IndexView] open_edit_drawer'
     event.stopPropagation() & event.preventDefault()
 
     $link = $(event.target)
@@ -37,7 +37,7 @@ class Locomotive.Views.ContentAssets.IndexView extends Backbone.View
       })
 
   hide_from_drawer: (stack_size) ->
-    console.log '[IndexView] hide_from_drawer'
+    # console.log '[IndexView] hide_from_drawer'
     # we might need to re-open this view further
     if @options.parent_view && stack_size == 0
       @options.parent_view.opened.picker = false
@@ -49,10 +49,16 @@ class Locomotive.Views.ContentAssets.IndexView extends Backbone.View
     $(window).on 'resize', @set_sidebar_max_height
 
   set_sidebar_max_height: ->
-    main_height = $(@el).height()
-    max_height  = @$('.content-assets').height()
-    max_height  = main_height if main_height > max_height
-    $(@dropzone.el).height(max_height)
+    setTimeout ( =>
+      main_height = $(@el).height()
+      max_height  = @$('.content-assets').height()
+      # max_height  = @$('.main-assets').height()
+      max_height  = main_height if main_height > max_height
+
+      console.log main_height
+
+      $(@dropzone.el).height(max_height)
+    ), 20
 
   remove: ->
     $(window).off 'resize', @set_sidebar_max_height

data/app/assets/javascripts/locomotive/views/editable_elements/edit_view.js.coffee

@@ -25,8 +25,8 @@ class Locomotive.Views.EditableElements.EditView extends Locomotive.Views.Shared
         @refresh_inputs $(data)
 
     $('.info-row select[name=block]').select2().on 'change', (event) =>
-      PubSub.publish 'editable_elements.block_selected', name: event.val
-      @filter_elements_by(event.val)
+      PubSub.publish 'editable_elements.block_selected', name: $(event.target).val()
+      @filter_elements_by($(event.target).val())
 
     # editable control elements
     $('.editable-elements .form-group.input.select select').select2().on 'change', (event) =>

data/app/assets/javascripts/locomotive/views/editable_elements/index_view.js.coffee

@@ -32,8 +32,8 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     $('body').removeClass('full-width-preview')
 
   replace_edit_view: (url) ->
+    @views[0].remove()
     $(@views[0].el).load url, =>
-      @views[0].remove()
       (@views[0] = new Locomotive.Views.EditableElements.EditView()).render()
 
   remove: ->

data/app/assets/javascripts/locomotive/views/editable_elements/page_view.js.coffee

@@ -32,11 +32,17 @@ class Locomotive.Views.EditableElements.PageView extends Backbone.View
     return false if element.size() == 0
     $(@el).animate({ scrollTop: element.offset().top }, 500)
 
+  each_elements: (view, callback) ->
+    $form_view  = $(view.el).parent()
+    element_id  = $form_view.find('input[name*="[id]"]').val()
+
+    callback(@$("*[data-element-id=#{element_id}]"), element_id)
+
   refresh_all: (msg, data) ->
     @options.parent_view.reload()
 
   refresh_text: (msg, data) ->
-    @refresh_elements 'text', data.view, ($elements) ->
+    @each_elements data.view, ($elements) ->
       $elements.each -> $(this).html(data.content)
 
   refresh_image_on_remove: (msg, data) ->
@@ -44,20 +50,19 @@ class Locomotive.Views.EditableElements.PageView extends Backbone.View
     @refresh_image(msg, data)
 
   refresh_image: (msg, data) ->
-    @refresh_elements 'image', data.view, ($elements, element_id) =>
-      current_image_url = data.view.$('input[name*="[content]"]').val()
-      image_url         = data.url || current_image_url
+    @each_elements data.view, ($elements, element_id) =>
+      if $elements.size() == 0
+        $elements = @find_and_reference_images_identified_by_url(data.view.path, element_id)
 
-      if $elements.size() > 0
-        @replace_images($elements, image_url)
-      else
-        @replace_images_identified_by_url(current_image_url, image_url, element_id)
+      return if $elements.size() == 0
 
-  refresh_elements: (type, view, callback) ->
-    $form_view  = $(view.el).parent()
-    element_id  = $form_view.find('input[name*="[id]"]').val()
+      resize_format     = data.view.$('.row').data('resize-format')
+      current_image_url = data.view.$('input[name*="[content]"]').val()
+      image_url         = data.url || current_image_url
 
-    callback($(@el).find("*[data-element-id=#{element_id}]"), element_id)
+      # ask for a cropped/resized version of the image
+      window.resize_image image_url, resize_format, (resized_image) =>
+        @replace_images($elements, resized_image)
 
   replace_images: (images, new_image_url) ->
     images.each ->
@@ -66,14 +71,10 @@ class Locomotive.Views.EditableElements.PageView extends Backbone.View
       else
         $(this).css("background-image", "url('" + new_image_url + "')")
 
-  replace_images_identified_by_url: (current_image_url, new_image_url, element_id) ->
-    # looking for DIVs with background-url property matching the previous image url
-    $el = $(@el).find("*[style*='#{current_image_url}']").attr('data-element-id', element_id)
-    $el.css("background-image", "url('" + new_image_url + "')")
-
-    # looking for IMGs with src attribute matching the previous image url
-    $el = $(@el).find("img[src*='#{current_image_url}']").attr('data-element-id', element_id)
-    $el.attr('src', new_image_url)
+  # retrieve all the images and background images by their editable path
+  # and associate the element_id to them
+  find_and_reference_images_identified_by_url: (path, element_id) ->
+    @$("*[style*='#{path}'],img[src*='#{path}']").attr('data-element-id', element_id)
 
   remove: ->
     super()

data/app/assets/javascripts/locomotive/views/inputs/array_view.js.coffee

@@ -33,28 +33,28 @@ class Locomotive.Views.Inputs.ArrayView extends Backbone.View
           $(this).find('.position-in-list').val(index)
 
   make_selectable: ->
-    if @$new_input.prop('tagName') == 'SELECT'
-      @make_simple_selectable()
-    else if @$new_input.attr('type') == 'hidden'
+    return if @$new_input.prop('tagName') != 'SELECT'
+
+    if @$new_input.data('list-url')?
       @make_remote_selectable()
+    else
+      @make_simple_selectable()
 
   make_remote_selectable: ->
-    Select2.helpers.build @$new_input
+    Select2Helpers.build @$new_input
     @$new_input.on 'change', (e) => @begin_add_item(e)
 
   make_simple_selectable: ->
     @$new_input.select2
-      containerCssClass:  'form-control'
-      formatResult:       @format_select_result
-      formatSelection:    @format_select_result
-      escapeMarkup:       (m) -> { m }
+      templateResult:     @format_select_result
+      templateSelection:   @format_select_result
 
   format_select_result: (state) ->
     return state.text unless state.id?
 
     display = $(state.element).data('display')
 
-    if display? then display else state.text
+    $("<span>#{if display? then display else state.text}</span>")
 
   begin_add_item_from_enter: (event) ->
     return if event.keyCode != 13
@@ -118,8 +118,7 @@ class Locomotive.Views.Inputs.ArrayView extends Backbone.View
     _.map @$list.find('> .item'), (item, i) -> $(item).data('id')
 
   reset_input_field: ->
-    @$new_input.val('')
-    @$new_input.select2('val', '')
+    @$new_input.val(null).trigger('change')
 
   showEl: (el) -> el.removeClass('hide')
   hideEl: (el) -> el.addClass('hide')

data/app/assets/javascripts/locomotive/views/inputs/document_picker_view.js.coffee

@@ -4,20 +4,21 @@ class Locomotive.Views.Inputs.DocumentPickerView extends Backbone.View
 
   initialize: ->
     super
-    @$input   = @$('input[type=hidden]')
+    @$input   = @$('select')
     @$link    = @$('a.edit')
 
   render: ->
     label = @$input.data('label')
 
-    Select2.helpers.build @$input,
-      allowClear:     true
-      initSelection:  (element, callback) ->
-        callback(text: label)
+    Select2Helpers.build @$input,
+      allowClear: true
 
     # hide the edit button if the user changes the selected document
-    @$input.on 'select2-selecting', (el) =>
+    @$input.data('select2').on 'unselect', (el) =>
       @$link.addClass('hide')
+      setTimeout ( => @$input.select2('close') ), 1
+
+    @$input.on 'change', (el) => @$link.addClass('hide')
 
   remove: ->
     @$input.select2('destroy')

data/app/assets/javascripts/locomotive/views/inputs/file_view.js.coffee

@@ -26,6 +26,7 @@ class Locomotive.Views.Inputs.FileView extends Backbone.View
     @$delete_btn    = @$('.buttons .delete')
 
     @persisted_file = @$('.row').data('persisted-file')
+    @path           = $(@el).data('path')
 
     @pubsub_token   = PubSub.subscribe 'file_picker.select', @use_content_asset
 

data/app/assets/javascripts/locomotive/views/inputs/rte/link_view.js.coffee

@@ -32,12 +32,10 @@ class Locomotive.Views.Inputs.Rte.LinkView extends Backbone.View
     @$link.data('bs.popover').setContent()
 
   attach_events: ->
-    # @$content.parents('form').on 'click', '.apply', @apply
     @$content.on 'click', '.apply', @apply
     @$content.on 'click', '.cancel', @hide
 
   detach_events: ->
-    # @$content.parents('form').off 'click', '.apply', @apply
     @$content.off 'click', '.apply', @apply
     @$content.off 'click', '.cancel', @hide