effective_ckeditor 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2138740d525679b6a11bfc5a2ffd6ed654d2b0
-  data.tar.gz: 8289180fc47e26d84e6c9efb9b71af3b618a8bd9
+  metadata.gz: 634f6c4a4c54685130e76c8a6cf45de59cd7970f
+  data.tar.gz: 09a062e6c4cded2883bbcf0b3f7732c829db8b03
 SHA512:
-  metadata.gz: 8f797097dee091ca776a2b473108469fa3c351301ea4055aecfd0a6534f1a9eea41c857eb5d6e265593b9555e6ad60dc06d679bec6fe1735fee754f0a908d922
-  data.tar.gz: 45c206d006ee6bb1ffe066b48499b24a1c3216e99660f05ebd3c3480a5d5df94ce11e0047d67896598fa439d5f6c23adfbc0d325450e0fd12e16a3250569990c
+  metadata.gz: 816ddb4a2b57a75aafcc523446c0e44338af7d2850c662a2611f3323626875114937eb6ab666292e0312396f1f7f26932545156d42129e2fe48f0be5e114f2f5
+  data.tar.gz: a3a749cddf4e0b48005fc42efcb490a61c04b99befb60c124af063e78732148d51130dda9a7dd66403f0bb043b0096727df1f36f2e90c32dd8f9791b29fb5ee2

data/app/assets/javascripts/ckeditor/plugins/effective_menus/plugin.js.coffee

@@ -35,6 +35,7 @@
       @menu.on 'click', 'li.dropdown.open,.dropdown-menu > li.dropdown,li:not(.dropdown)', (event) =>
         event.stopPropagation()
         @menu.find('.open').removeClass('open')
+        @menu.data('dirty', true)
         # Open the CKEDITOR dialog and pass the source effective_menu_item $('li') to the dialog
         CKEDITOR.instances[Object.keys(CKEDITOR.instances)[0]].openDialog 'effectiveMenusDialog', (dialog) ->
           dialog.effective_menu_item = $(event.currentTarget)
@@ -51,6 +52,7 @@
         item = $(@menu.data('effective-menu-new-html').replace(/:new/g, "#{unique_id}"))
 
         @menu.children('.actions').before(item)
+        @menu.data('dirty', true)
 
         CKEDITOR.instances[Object.keys(CKEDITOR.instances)[0]].openDialog 'effectiveMenusDialog', (dialog) ->
           dialog.effective_menu_item = item
@@ -165,6 +167,8 @@
       # so we delete it here
       @menu.find('meta,li.effective-menu-expand').remove()
 
+      @menu.data('dirty', true)
+
       # Collapse any empty dropdowns we may have expanded back to leafs
       @menu.find('.dropdown-menu:empty').each (index, item) ->
         item = $(item).closest('.dropdown')
@@ -192,14 +196,7 @@
     # The first dropdowns all have Depth of 1
     depthOf: (item) -> item.parentsUntil(@menu, 'li').length
 
-    # Just pass _destroyed = 1 back to rails to delete this item
-    # Rails seems to disregard new items set to the new Date.now() values anyhow
-    # Put all deleted items after the .actions div just to be tidy
-    markDestroyed: (item) ->
-      item.hide().addClass('destroyed')
-      item.find('li').addClass('destroyed')
-      item.find("input[name$='[_destroy]']").val(1)
-      @menu.children('.actions').after(item.remove())
+    markDestroyed: (item) -> item.remove()
 
     # This method is called with a Hash value
     # that is called by reference from the parent function
@@ -209,6 +206,8 @@
     # This way the saves happen all at once
 
     serialize: (retval) ->
+      return if @menu.data('dirty') != true
+
       # console.log "============ BEFORE =============="
       # @menu.find('li').each (index, item) =>
       #   item = $(item)
@@ -246,16 +245,15 @@
       # This retVal has to account for multiple effective-menus on one page
       retval[@menu.data('effective-menu-id')] = items
 
-    saveComplete: ->
-      @menu.find('.destroyed').remove()
+    saveComplete: (data) -> @menu.data('dirty', false)
 
     assignLftRgt: (parent, lft) ->
       rgt = lft + 1
 
-      parent.children('.dropdown-menu').children('li:not(.destroyed)').each (_, child) =>
+      parent.children('.dropdown-menu').children('li').each (_, child) =>
         rgt = @assignLftRgt($(child), rgt)
 
-      parent.children('li:not(.destroyed)').each (_, child) =>
+      parent.children('li').each (_, child) =>
         rgt = @assignLftRgt($(child), rgt)
 
       parent.children('.menu-item').children("input[name$='[lft]']").val(lft)

data/app/assets/javascripts/ckeditor/plugins/effective_regions/plugin.js.coffee

@@ -55,10 +55,10 @@ SaveAll = {
       dataType: 'json'
       data: { effective_regions: regionData, effective_menus: menuData }
       async: false
-      complete: (data) ->
-        $('.effective-menu').effectiveMenuEditor('saveComplete')
-        if data.responseText == 'refresh'
-          location.reload(true)
+      complete: (response) ->
+        data = response['responseJSON'] || {}
+        $('.effective-menu').effectiveMenuEditor('saveComplete', data['effective_menus'])
+        location.reload(true) if data['refresh'] == true
 }
 
 Exit = {

data/lib/effective_ckeditor/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCkeditor
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_ckeditor
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Code and Effect