locomotive_cms 2.0.0.rc7 → 2.0.0.rc8

data/Gemfile

@@ -22,9 +22,8 @@ end
 group :assets do
   gem 'sass-rails',   '~> 3.2.4'
   gem 'coffee-rails', '~> 3.2.2'
-  gem 'uglifier',     '~> 1.2.3'
-  gem 'compass',        :git => 'git://github.com/chriseppstein/compass.git', :branch => 'no_rails_integration'
-  gem 'compass-rails',  :git => 'git://github.com/Compass/compass-rails.git'
+  gem 'uglifier',     '~> 1.2.4'
+  gem 'compass-rails'
 end
 
 group :test do
@@ -36,6 +35,7 @@ group :test do
   # gem 'growl-glue'
 
   gem 'cucumber-rails', :require => false
+  gem 'poltergeist'
   gem 'rspec-rails', '~> 2.8.0'
   gem 'shoulda-matchers'
 
@@ -50,4 +50,6 @@ group :test do
   gem 'json_spec'
 
   gem 'database_cleaner'
-end
+
+  # gem 'debugger', :git => 'git://github.com/cldwalker/debugger.git'
+end

data/README.textile

@@ -24,8 +24,8 @@ h2. Gems
 
 Here is a short list of main gems / technologies used in the application.
 
-* Rails 3.2.3
-* Mongoid 2.4.6 (with MongoDB 2.0)
+* Rails 3.2.5
+* Mongoid 2.4.9 (with MongoDB 2.0)
 * Liquid
 * Devise
 * Carrierwave
@@ -46,7 +46,7 @@ h2. Community
 
 * Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms or the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ (deprecated)
 * Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/
-* "Follow us on twitter":http://twitter.com/locomotiveapp
+* "Follow us on twitter":http://twitter.com/locomotivecms
 
 h2. Contributing to Locomotive
 
@@ -55,6 +55,7 @@ Locomotive CMS is an open source project, we encourage contributions. If you hav
 * Install ruby and mongoDB
 * Clone the project <code>git clone git@github.com:locomotivecms/engine.git</code>
 * Setup a virtual host entry for <code>test.example.com</code> to point to localhost
+* Install PhantomJS (Required for the cucumber suite See: https://github.com/jonleighton/poltergeist)
 * Run the tests <code>rake</code>
 * Write your failing tests
 * Make the tests pass

data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js

@@ -25,7 +25,7 @@ define(
             picker.close();
           }
 
-          picker.render()
+          picker.fetch_assets();
         },
 
         /**

data/app/assets/javascripts/locomotive/utils/core_ext.js

@@ -69,5 +69,7 @@
     doc.head.appendChild(stylesheet);
   }
 
+  $.ui.dialog.prototype.overlayEl = function() { return this.overlay.$el; }
+
 })();
 

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

@@ -83,3 +83,10 @@ class Locomotive.Views.ApplicationView extends Backbone.View
       locale = $(@).attr('data-locale')
       window.addParameterToURL 'content_locale', locale
 
+  unique_dialog_zindex: ->
+    # returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
+    # Each modal window should have a different zIndex, otherwise there will be conflicts between them.
+    window.Locomotive.jQueryModals ||= 0
+
+    998 + window.Locomotive.jQueryModals++
+

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

@@ -12,7 +12,10 @@ class Locomotive.Views.ContentAssets.PickerView extends Locomotive.Views.Shared.
     ich.content_asset_picker
 
   fetch_assets: ->
-    @collection.fetch()
+    @_reset()
+    @collection.fetch
+      success: () =>
+        @open()
 
   build_uploader: (el, link) ->
     link.bind 'click', (event) ->

data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee

@@ -50,11 +50,13 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
       settings = _.extend {}, @tinyMCE_settings(),
         oninit: ((editor) =>
           $.cmd 'S', (() =>
-            $(textarea).val(editor.getBody().innerHTML).trigger('change')
+            editor.save()
+            $(textarea).trigger('changeSilently')
             @$('form').trigger('submit')
           ), [], ignoreCase: true, document: editor.dom.doc),
         onchange_callback: (editor) =>
-          $(textarea).val(editor.getBody().innerHTML).trigger('change')
+          editor.save()
+          $(textarea).trigger('changeSilently')
 
       $(textarea).tinymce(settings)
 

data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee

@@ -26,11 +26,9 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     @dialog = $(@el).dialog
       autoOpen: false
       modal:    true
-      zIndex:   998
+      zIndex:   window.application_view.unique_dialog_zindex()
       width:    770,
       create: (event, ui) =>
-        $('.ui-widget-overlay').bind 'click', => @close()
-
         $(@el).prev().find('.ui-dialog-title').html(@$('h2').html())
         @$('h2').remove()
         actions = @$('.dialog-actions').appendTo($(@el).parent()).addClass('ui-dialog-buttonpane ui-widget-content ui-helper-clearfix')
@@ -39,6 +37,7 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
         actions.find('input[type=submit]').click (event) => @save(event)
 
       open: (event, ui, extra) =>
+        $(@el).dialog('overlayEl').bind 'click', => @close()
         # nothing to do
 
   open: ->
@@ -50,11 +49,14 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
       parent_el.find('.new-section').hide()
       parent_el.find('.edit-section').show()
 
+    @clear_errors()
+
     $(@el).dialog('open')
 
   close: (event) ->
     event.stopPropagation() & event.preventDefault() if event?
     @clear_errors()
+    $(@el).dialog('overlayEl').unbind('click')
     $(@el).dialog('close')
 
   center: ->
@@ -69,6 +71,9 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     else
       @refresh()
 
+  slugify_label_field: ->
+    # disabled in a popup form
+
   enable_has_many_fields: ->
     # disabled in a popup form
 

data/app/assets/javascripts/locomotive/views/content_types/_form_view.js.coffee

@@ -12,8 +12,6 @@ class Locomotive.Views.ContentTypes.FormView extends Locomotive.Views.Shared.For
   initialize: ->
     @model = new Locomotive.Models.ContentType(@options.content_type)
 
-    window.foo = @model
-
     Backbone.ModelBinding.bind @
 
   render: ->

data/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee

@@ -58,11 +58,18 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View
   fetch_inverse_of_list: ->
     @$('li.input.inverse-of select option').remove()
 
-    _.each @inverse_of_list[@model.get('type')], (data) =>
+    list = @inverse_of_list[@model.get('type')] || []
+
+    _.each list, (data) =>
       if data.class_name == @model.get('class_name')
-        option = new Option(data.label, data.name, data.class_name == @model.get('inverse_of') || @inverse_of_list.length == 1)
+        option = new Option(data.label, data.name, data.name == @model.get('inverse_of') || list.length == 1)
         @$('li.input.inverse-of select').append(option)
 
+    # by default, select the first option
+    if !@model.get('inverse_of')? && list.length > 0
+      @model.set
+        inverse_of: list[0].name
+
   render_select_options_view: ->
     @select_options_view = new Locomotive.Views.ContentTypes.SelectOptionsView
       model:      @model

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

@@ -15,8 +15,6 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
 
     Backbone.ModelBinding.bind @, checkbox: 'class'
 
-    window.foo = @model
-
   render: ->
     super()
 
@@ -57,15 +55,16 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
     @$('#site_memberships_input').append(@memberships_view.render().el)
 
   enable_liquid_editing: ->
-    input = @$('#site_robots_txt')
-    @editor = CodeMirror.fromTextArea input.get()[0],
-      mode:             'liquid'
-      autoMatchParens:  false
-      lineNumbers:      false
-      passDelay:        50
-      tabMode:          'shift'
-      theme:            'default'
-      onChange: (editor) => @model.set(robots_txt: editor.getValue())
+    if($('#site_robots_txt').length)
+      input = @$('#site_robots_txt')
+      @editor = CodeMirror.fromTextArea input.get()[0],
+        mode:             'liquid'
+        autoMatchParens:  false
+        lineNumbers:      false
+        passDelay:        50
+        tabMode:          'shift'
+        theme:            'default'
+        onChange: (editor) => @model.set(robots_txt: editor.getValue())
 
   save: (event) ->
     if @model.includes_domain(window.location.host)

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

@@ -24,6 +24,8 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
 
     @toolbar_view.render()
 
+    @content_assets_picker_view.render()
+
   enable_iframe_autoheight: ->
     iframe = @iframe
 
@@ -89,6 +91,13 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
           toolbar_view.show_status 'loading'
           window.history.pushState('Object', 'Title', link.attr('href').replace('_edit', '_admin'))
 
+  unique_dialog_zindex: ->
+    # returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
+    # Each modal window should have a different zIndex, otherwise there will be conflicts between them.
+    window.Locomotive.jQueryModals ||= 0
+
+    1050 + window.Locomotive.jQueryModals++
+
   _$: (selector) ->
     $(selector, @iframe[0].contentWindow.document)
 

data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee

@@ -16,14 +16,14 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
 
     @model = new Locomotive.Models.Page(@options.page)
 
-    window.foo = @model
-
     @touched_url = false
 
     @image_picker_view = new Locomotive.Views.ThemeAssets.ImagePickerView
       collection: new Locomotive.Models.ThemeAssetsCollection()
       on_select:  @insert_image
 
+    @image_picker_view.render()
+
     Backbone.ModelBinding.bind @
 
     @editable_elements_view = new Locomotive.Views.EditableElements.EditAllView(collection: @model.get('editable_elements'))
@@ -58,7 +58,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
   open_image_picker: (event) ->
     event.stopPropagation() & event.preventDefault()
     @image_picker_view.editor = @editor
-    @image_picker_view.render()
+    @image_picker_view.fetch_assets()
 
   insert_image: (path) ->
     text = "{{ '#{path}' | theme_image_url }}"

data/app/assets/javascripts/locomotive/views/shared/asset_picker_view.js.coffee

@@ -11,11 +11,9 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
     @collection.bind('remove', @remove_asset)
 
   render: ->
-    @_reset()
-
     $(@el).html(@template()())
 
-    @fetch_assets()
+    @create_dialog()
 
     return @
 
@@ -29,33 +27,32 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
     # please overide build_uploader
 
   create_dialog: ->
-    @dialog = $(@el).dialog
+    @dialog ||= $(@el).dialog
+      autoOpen: false
       modal:    true
-      zIndex:   998
+      zIndex:   window.application_view.unique_dialog_zindex()
       width:    650,
       create: (event, ui) =>
-        $('.ui-widget-overlay').bind 'click', => @close()
-
         $(@el).prev().find('.ui-dialog-title').html(@$('h2').html())
         @$('h2').remove()
         actions = @$('.dialog-actions').appendTo($(@el).parent()).addClass('ui-dialog-buttonpane ui-widget-content ui-helper-clearfix')
 
         actions.find('#close-link').click (event) => @close(event)
 
-      open: (event, ui, extra) =>
-        actions = $(@el).parent().find('.ui-dialog-buttonpane')
-        el      = actions.find('input[type=file]')
-        link    = actions.find('#upload-link')
+        input = actions.find('input[type=file]')
+        link  = actions.find('#upload-link')
 
-        @build_uploader(el, link)
+        @build_uploader(input, link)
 
-    @open()
+      open: (event, ui, extra) =>
+        $(@el).dialog('overlayEl').bind 'click', => @close()
 
   open: ->
     $(@el).dialog('open')
 
   close: (event) ->
     event.stopPropagation() & event.preventDefault() if event?
+    $(@el).dialog('overlayEl').unbind('click')
     $(@el).dialog('close')
 
   shake: ->
@@ -70,8 +67,6 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
 
     @_refresh()
 
-    setTimeout (=> @create_dialog()), 30 # disable flickering
-
   add_asset: (asset, first) ->
     # please overide add_asset (the 'first' param is to know if it comes from the first collection fetch)
 
@@ -94,6 +89,4 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
   _on_refresh: ->
 
   _reset: ->
-    $('.ui-widget-overlay').unbind 'click'
-    @$('.actions input[type=file]').remove()
-    @dialog.dialog('destroy') if @dialog?
+    # for nothing to do

data/app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee

@@ -24,10 +24,6 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
     @collection   = @model.get(@options.name)
     @all_entries  = @options.all_entries
 
-    window.collection = @collection
-    window.bar = @all_entries
-    window.model = @model
-
   render: ->
     $(@el).html(@template()())
 

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -36,7 +36,8 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     previous_attributes = _.clone @model.attributes
 
     @model.save {},
-      headers: options.headers
+      headers:  options.headers
+      silent:   true # since we pass an empty hash above, no need to trigger the callbacks
       success: (model, response, xhr) =>
         form.trigger('ajax:complete')
 

data/app/assets/javascripts/locomotive/views/snippets/_form_view.js.coffee

@@ -19,6 +19,8 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
       collection: new Locomotive.Models.ThemeAssetsCollection()
       on_select:  @insert_image
 
+    @image_picker_view.render()
+
     Backbone.ModelBinding.bind @
 
   render: ->
@@ -38,7 +40,7 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
   open_image_picker: (event) ->
     event.stopPropagation() & event.preventDefault()
     @image_picker_view.editor = @editor
-    @image_picker_view.render()
+    @image_picker_view.fetch_assets()
 
   insert_image: (path) ->
     text = "{{ '#{path}' | theme_image_url }}"

data/app/assets/javascripts/locomotive/views/theme_assets/_form_view.js.coffee

@@ -15,10 +15,10 @@ class Locomotive.Views.ThemeAssets.FormView extends Locomotive.Views.Shared.Form
 
     @model = new Locomotive.Models.ThemeAsset(@options.theme_asset)
 
-    window.foo = @model
-
     @image_picker_view = new Locomotive.Views.ThemeAssets.ImagePickerView on_select: @insert_image
 
+    @image_picker_view.render()
+
     Backbone.ModelBinding.bind @
 
   render: ->
@@ -72,10 +72,10 @@ class Locomotive.Views.ThemeAssets.FormView extends Locomotive.Views.Shared.Form
   open_image_picker: (event) ->
     event.stopPropagation() & event.preventDefault()
     @image_picker_view.editor = @editor
-    @image_picker_view.render()
+    @image_picker_view.fetch_assets()
 
   insert_image: (path) ->
-    text = "{{ '#{path}' | theme_image_url }}"
+    text = "'#{path}'"
     @editor.replaceSelection(text)
     @image_picker_view.close()
 

data/app/assets/javascripts/locomotive/views/theme_assets/image_picker_view.js.coffee

@@ -15,7 +15,12 @@ class Locomotive.Views.ThemeAssets.ImagePickerView extends Locomotive.Views.Shar
     ich.theme_image_picker
 
   fetch_assets: ->
-    @collection.fetch data: { content_type: 'image' }
+    @_reset()
+    @collection.fetch
+      data:
+        content_type: 'image'
+      success: () =>
+        @open()
 
   build_uploader: (el, link) ->
     link.bind 'click', (event) ->
@@ -37,4 +42,7 @@ class Locomotive.Views.ThemeAssets.ImagePickerView extends Locomotive.Views.Shar
 
   add_asset: (asset) ->
     @$('ul.list').append(ich.theme_asset(asset.toJSON()))
-    @_refresh()
+    @_refresh()
+
+  _reset: ->
+    @$('ul.list').empty()