Feature/sequel

Bowerfile

@@ -1,36 +1,36 @@
 assets_path 'assets/javascript'
 
-asset 'underscore'
-asset 'backbone'
-asset 'backbone-notifier', :github => 'ewebdev/backbone.notifier#v0.2.4'
+asset 'underscore', '1.9.1'
+asset 'backbone', '1.4.0'
+asset 'backbone-notifier', 'https://github.com/ewebdev/backbone.notifier.git#v0.2.4'
 
-asset 'wysihtml5', :github => 'xing/wysihtml5'
-asset 'leaflet'
+asset 'wysihtml5', 'https://github.com/xing/wysihtml5.git'
+asset 'leaflet', '1.0.0'
 
 # jQuery
-asset 'data-tables', :github => 'DataTables/DataTables'
-asset 'flot', :github => 'flot/flot'
-asset 'knob', :github => 'aterrien/jQuery-Knob'
-asset 'uniform', :github => 'AudithSoftworks/Uniform'
-asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4'
-asset 'jquery-filthypillow', :github => 'Rademade/jquery.filthypillow#master'
-asset 'magnific-popup', :github => 'dimsemenov/Magnific-Popup'
-asset 'touch-punch', :github => 'furf/jquery-ui-touch-punch'
+asset 'data-tables', 'https://github.com/DataTables/DataTables.git#1.10.19'
+asset 'flot', '0.8.3'
+asset 'knob', 'https://github.com/aterrien/jQuery-Knob.git#1.2.13'
+asset 'uniform', 'https://github.com/AudithSoftworks/Uniform.git'
+asset 'jquery-ui', 'https://github.com/jquery/jquery-ui.git#1.11.4'
+asset 'jquery-filthypillow', 'https://github.com/Rademade/jquery.filthypillow.git#master'
+asset 'magnific-popup', 'https://github.com/dimsemenov/Magnific-Popup.git'
+asset 'touch-punch', 'https://github.com/furf/jquery-ui-touch-punch.git'
 asset 'jquery-ujs'
 
 # Images
-asset 'jcrop', :github => 'tapmodo/Jcrop#v0.9.12'
-asset 'jquery-fileupload', :github => 'blueimp/jQuery-File-Upload'
+asset 'jcrop', 'https://github.com/tapmodo/Jcrop.git#v0.9.12'
+asset 'jquery-fileupload', 'https://github.com/blueimp/jQuery-File-Upload.git#v9.12.6'
 
 # List
-asset 'TableDnD'
+asset 'TableDnD', '0.9.2'
 
 # Form
-asset 'moment'
-asset 'jquery-form', :github => 'malsup/form'
-asset 'jquery-serialize', :github => 'macek/jquery-serialize-object'
-asset 'jquery-formrestrict', :github => 'treyhunner/jquery-formrestrict'
-asset 'jquery-validation', :github => 'jzaefferer/jquery-validation#v1.13.1'
+asset 'moment', '2.24.0'
+asset 'jquery-form', 'https://github.com/malsup/form.git#v4.0.0'
+asset 'jquery-serialize', 'https://github.com/macek/jquery-serialize-object.git'
+asset 'jquery-formrestrict', 'https://github.com/treyhunner/jquery-formrestrict.git'
+asset 'jquery-validation', 'https://github.com/jzaefferer/jquery-validation.git#v1.13.1'
 
 #Thead
-asset 'floatThead', :github => 'mkoryak/floatThead'
+asset 'floatThead', 'https://github.com/mkoryak/floatThead.git'

Gemfile

@@ -10,6 +10,7 @@ end
 
 group :test do
   gem 'coveralls', :require => false
+  gem 'ckeditor', '~> 4.0'
 
   # Uploaders
   gem 'carrierwave'

app/assets/javascripts/app/common/helpers.coffee

@@ -0,0 +1,12 @@
+window.RademadeAdmin = {
+  helpers: {
+    stripScripts: (string) ->
+      div = document.createElement('div')
+      div.innerHTML = string
+      scripts = div.getElementsByTagName('script')
+      i = scripts.length
+      while i--
+        scripts[i].parentNode.removeChild scripts[i]
+      div.innerHTML
+  }
+}

app/assets/javascripts/app/common/uploader.coffee

@@ -19,11 +19,15 @@ class @Uploader extends Backbone.View
         @showLoader()
         $form.submit().done @updateUploader
       always : @hideLoader
+      fail : (event, data) ->
+        errorMessage = data?._response?.jqXHR?.responseJSON?.error
+        window.notifier.notify(errorMessage) if errorMessage
 
   updateUploader : (result) =>
     @$el.find('[data-preview-item]').replaceWith(result.html)
     @$el.find('.upload-holder.hide').removeClass('hide')
     @$hidden.val(result.file.url)
+    @$hidden.change()
     ImagePreview.initPlugin()
 
   showLoader : () ->
@@ -38,6 +42,7 @@ class @Uploader extends Backbone.View
     @$el.find('.upload-holder:has([data-preview-item])').fadeOut 300, () ->
       $(this).addClass('hide').show()
     @$hidden.val('')
+    @$hidden.change()
 
   _getUploaderData : () ->
     uploaderData = _.pick @$uploader.data(), 'id', 'model', 'column', 'uploader'
@@ -63,4 +68,4 @@ class @Uploader extends Backbone.View
     @initAll()
 
 $ ->
-  $(document).on 'page:load ready init-plugins', Uploader.initPlugin
+  $(document).on 'page:load ready init-plugins', Uploader.initPlugin

app/assets/javascripts/app/common/url-visitor.coffee

@@ -1,6 +1,6 @@
 initUrlVisit = () ->
   $('[data-link-url]').click () ->
-    Turbolinks.visit $(this).data('linkUrl')
+    window.location.href = $(this).data('linkUrl')
 
 $ ->
-  $(document).on 'ready page:load init-plugins', initUrlVisit
+  $(document).on 'ready page:load init-plugins', initUrlVisit

app/assets/javascripts/app/content/view.coffee

@@ -1,31 +1,42 @@
 class @Content extends Backbone.View
 
-  renderItemFromUrl : (url, cb) ->
+  isLoadingContentItem = false
+
+  renderItemFromUrl : (url, cb, urlData = {}) ->
+    return if isLoadingContentItem
+    return if url == ''
     $(document).trigger 'before-content-render'
     @_updateHistory(url)
-    $.get url, layout : false, (html) =>
+    $('#loader').removeClass('hide')
+    isLoadingContentItem = true
+    $.get url, _.extend(urlData, layout : false), (html) =>
       $contentItem = $(html)
       $('[data-content]').append $contentItem
       $(window).scrollTop(0)
       $(document).trigger 'init-plugins'
       @bindClick $contentItem
       cb($contentItem) if cb
+      isLoadingContentItem = false
+      $('#loader').addClass('hide')
 
-  renderModel : (model) ->
+  renderModel : (model, urlData = {}) ->
     @renderItemFromUrl model.get('editurl'), ($contentItem) =>
       $contentItem.find('form').on 'ajax-submit-done', (e, response) =>
         model.update response.data
         $contentItem.remove()
+    , urlData
 
   moveToPreviousContentItem : () ->
     @moveToContentItem $('[data-content-item]:nth-last-child(2)')
 
   moveToContentItem : ($contentItem) ->
-    return if $contentItem.is(':last-child')
-    $contentItem.nextAll('[data-content-item]').remove()
-    if $contentItem.is(':first-child')
-      @renderItemFromUrl $contentItem.data('contentItem'), () ->
-        $contentItem.remove()
+    if $contentItem.length is 0
+      window.history.back() if window.history.length > 2
+    else
+      $contentItem.nextAll('[data-content-item]').remove()
+      if $contentItem.is(':first-child') || !$contentItem.has('.content-data').length
+        @renderItemFromUrl $contentItem.data('contentItem'), () ->
+          $contentItem.remove()
 
   bindClick : ($el) ->
     $el.find('[data-content-header]').bind 'click', (e) =>
@@ -34,27 +45,35 @@ class @Content extends Backbone.View
       @renderItemFromUrl $(e.currentTarget).data('contentUrl')
       false
     $el.find('[data-content-close]').bind 'click', (e) =>
-      @moveToContentItem $(e.currentTarget).closest('[data-content-item]').prev()
+      $contentItem = $(e.currentTarget).closest('[data-content-item]')
+      $prevContentItem = $contentItem.prev()
+      if $prevContentItem.length is 0
+        @moveToContentItem $contentItem
+      else
+        @moveToContentItem $prevContentItem
+
+  bindDocumentClick : () =>
+    @bindClick($(document))
 
   bindHistoryBack : () ->
     $(window).bind 'popstate', (e) ->
-      state = e.originalEvent.state
-      window.location.href = state.url if state.url
+      window.location.reload()
 
   _updateHistory : (url) ->
     if history.pushState isnt undefined and $('[data-content-header]').length < 2
       history.pushState url : url, document.title, url
 
   @init : () ->
-    content = new Content()
+    content = new this()
     content.bindHistoryBack()
+    content.bindDocumentClick()
     content
 
+  @initInstance : () =>
+    window.ContentInstance = @init()
+
   @getInstance : () ->
-    instance = null
-    do () ->
-      instance ||= Content.init()
+    window.ContentInstance
 
-$ ->
-  $(document).on 'page:load ready', () ->
-    Content.getInstance().bindClick $(document)
+  $ ->
+    $(document).on 'page:load ready', Content.initInstance

app/assets/javascripts/app/forms/forgot-password-form.coffee

@@ -0,0 +1,5 @@
+$(document).on 'ready page:load', ->
+
+  $('#forgot-password-form').on
+    'ajax-submit-done': (e, data) ->
+      $(e.currentTarget).html(data.template)

app/assets/javascripts/app/forms/login.coffee

@@ -1,4 +1,8 @@
 $(document).on 'ready page:load', ->
 
   $('#login-form').on
-    'ajax-submit-done': -> window.location.reload()
+    'ajax-submit-done': (event, data) ->
+      if data.redirect_url && typeof data.redirect_url is 'string'
+        window.location.href = data.redirect_url
+      else
+        window.location.reload()

app/assets/javascripts/app/forms/reset-password-form.coffee

@@ -0,0 +1,5 @@
+$(document).on 'ready page:load init-plugins', ->
+
+  $('#reset-password-form').on
+    'ajax-submit-done': (e) ->
+      window.location.reload()

app/assets/javascripts/app/gallery/image/collection-view.coffee

@@ -7,12 +7,7 @@ class @GalleryImageCollectionView extends Backbone.View
       @_initImage $(image)
 
   initSort : () ->
-    sortUrl = @$el.data('sortableUrl')
-    if sortUrl
-      @images.setSortUrl sortUrl
-      @$el.sortable
-        stop : () =>
-          @images.sort @_getSortedImages()
+    @$el.sortable() if @$el.data('sortable') && @$el.sortable
 
   addImage : ($image) ->
     @_initImage $image
@@ -32,4 +27,4 @@ class @GalleryImageCollectionView extends Backbone.View
       el : $el
     collectionView.initImages className
     collectionView.initSort()
-    collectionView
+    collectionView

app/assets/javascripts/app/gallery/image/collection.coffee

@@ -5,15 +5,3 @@ class @GalleryImageCollection extends Backbone.Collection
 
   getClassName : () ->
     @className
-
-  setSortUrl : (sortUrl) ->
-    @sortUrl = sortUrl
-
-  sort : (images) ->
-    $.ajax
-      type : 'patch'
-      url : @sortUrl
-      data :
-        class_name : @className
-        images : images
-      dataType : 'json'

app/assets/javascripts/app/gallery/image/model.coffee

@@ -1,19 +1,10 @@
 class @GalleryImageModel extends ImageModel
 
   remove : () ->
-    $.ajax
-      type : 'delete'
-      url : @get 'removeUrl'
-      data :
-        class_name : @collection.getClassName()
-      dataType : 'json'
-      success : () =>
-        @collection.remove this
-        @trigger 'image-removed'
-      error : (data) =>
-        window.notifier.notify data.error
+    @collection.remove this
+    @trigger 'image-removed'
 
   _getData : () ->
     data = super
     data.class_name = @collection.getClassName()
-    data
+    data

app/assets/javascripts/app/gallery/image/view.coffee

@@ -2,14 +2,14 @@ class @GalleryImageView extends Backbone.View
 
   events :
     'click' : 'showPopup'
-    'click [data-remove-url]' : 'remove'
+    'click [data-remove]' : 'remove'
 
   initialize : () ->
     @model.on 'image-removed', @_onImageRemove
     @model.on 'change:resizedUrl', @_updateImageUrl
 
   remove : () ->
-    @model.remove() if confirm I18n.t('rademade_admin.remove_confirm.image')
+    @model.remove()
     false
 
   showPopup : () ->
@@ -27,8 +27,7 @@ class @GalleryImageView extends Backbone.View
 
   @init : ($el) ->
     model = new GalleryImageModel $el.data()
-    model.set 'removeUrl', $el.find('[data-remove-url]').data('removeUrl')
     new GalleryImageView
       model : model
       el : $el
-    model
+    model