effective_ckeditor 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29cefd07b38fd6a0458159c1f7d196977ca9b143
-  data.tar.gz: e03c4f90cefd1259d4f28fa91aa3964036677208
+  metadata.gz: d165f84430656b10ab8f8ba62df645964858890a
+  data.tar.gz: 708735a82d9871476dccb38f56e0aa7af3d5153a
 SHA512:
-  metadata.gz: 968f46e67146402994a093b3f86207ea0b583088b2e8c4b07956c9f518d335507ff06d17207d9a09eb9d5ceb8e4a7ebf4f6f657270055122f1f15a5df9d56063
-  data.tar.gz: ac7292ed43b694eec95a7eb8645e223c26d15464109d559da239c4ea022634d8fe0b6d191d609db4265fa056fa6c1ce9ecbdc1eec93ed09b355c71ccdefe9b90
+  metadata.gz: 1d7636a51adb87a78ab1afe07d086f95102951446e611ed1f2999fc4020ef711abf97f3a8f2c8af2b0f4436621f2cd3bd03cb83d5bc8d2461618338991e10573
+  data.tar.gz: be7eff5a1e22c58030d1f72842529f6e483adf405c2732320341c36b83584834aa2cd53d443911e2ad506fcefdd4eb770c57dc40de3f71fa9d715819052cd11f

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

@@ -330,13 +330,15 @@ CKEDITOR.plugins.add 'effective_menus',
                 id: 'source',
                 type: 'radio',
                 label: 'Link Type',
-                items: [['Page', 'Page'], ['URL', 'URL'], ['Route', 'Route'], ['Divider', 'Divider']]
+                items: [['Page', 'Page'], ['URL', 'URL'], ['Route', 'Route'], ['Divider', 'Divider'], ['Dropdown', 'Dropdown']]
                 setup: (element) ->
                   menuable_id = element.children('.menu-item').children("input[name$='[menuable_id]']").val() || ''
                   special = element.children('.menu-item').children("input[name$='[special]']").val() || ''
                   url = element.children('.menu-item').children("input[name$='[url]']").val() || ''
 
-                  if menuable_id.length > 0
+                  if this.getDialog().effective_menu_item.hasClass('dropdown')
+                    this.setValue('Dropdown')
+                  else if menuable_id.length > 0
                     this.setValue('Page')
                   else if special == 'divider'
                     this.setValue('Divider')
@@ -348,12 +350,18 @@ CKEDITOR.plugins.add 'effective_menus',
                     this.setValue('Page')
 
                 onChange: (event) ->
+                  if this.getValue() != 'Dropdown'
+                    radios = $('#' + this.getDialog().getContentElement('item', 'source').getElement().getId())
+                    radios.find('input').prop('disabled', false)
+                    radios.find("input[value='Dropdown']").prop('disabled', true)
+
                   if this.getValue() == 'Page'
                     this.getDialog().getContentElement('item', 'title').getElement().show()
                     this.getDialog().getContentElement('item', 'menuable_id').getElement().show()
 
                     this.getDialog().getContentElement('item', 'url').getElement().hide()
                     this.getDialog().getContentElement('item', 'special').getElement().hide()
+                    this.getDialog().getContentElement('item', 'dropdown').getElement().hide()
 
                   if this.getValue() == 'URL'
                     this.getDialog().getContentElement('item', 'title').getElement().show()
@@ -361,12 +369,23 @@ CKEDITOR.plugins.add 'effective_menus',
 
                     this.getDialog().getContentElement('item', 'menuable_id').getElement().hide()
                     this.getDialog().getContentElement('item', 'special').getElement().hide()
+                    this.getDialog().getContentElement('item', 'dropdown').getElement().hide()
 
                   if this.getValue() == 'Divider'
                     this.getDialog().getContentElement('item', 'url').getElement().hide()
                     this.getDialog().getContentElement('item', 'title').getElement().hide()
                     this.getDialog().getContentElement('item', 'menuable_id').getElement().hide()
                     this.getDialog().getContentElement('item', 'special').getElement().hide()
+                    this.getDialog().getContentElement('item', 'dropdown').getElement().hide()
+
+                  if this.getValue() == 'Dropdown'
+                    this.getDialog().getContentElement('item', 'title').getElement().show()
+                    this.getDialog().getContentElement('item', 'dropdown').getElement().show()
+                    $('#' + this.getDialog().getContentElement('item', 'source').getElement().getId()).find('input').prop('disabled', true)
+
+                    this.getDialog().getContentElement('item', 'special').getElement().hide()
+                    this.getDialog().getContentElement('item', 'url').getElement().hide()
+                    this.getDialog().getContentElement('item', 'menuable_id').getElement().hide()
 
                   if this.getValue() == 'Route'
                     this.getDialog().getContentElement('item', 'title').getElement().show()
@@ -374,32 +393,28 @@ CKEDITOR.plugins.add 'effective_menus',
 
                     this.getDialog().getContentElement('item', 'menuable_id').getElement().hide()
                     this.getDialog().getContentElement('item', 'url').getElement().hide()
+                    this.getDialog().getContentElement('item', 'dropdown').getElement().hide()
               },
               {
                 id: 'menuable_id',
                 type: 'select',
                 label: 'Page',
-                items: (
-                  pages = []
-                  $.ajax
-                    url: '/admin/pages'
-                    dataType: 'json'
-                    async: false
-                    complete: (data) -> pages = data.responseJSON
-                  pages
-                ),
+                items: ((CKEDITOR.config['effective_regions'] || {})['pages'] || [['', '']]),
                 setup: (element) ->
                   this.setValue(element.children('.menu-item').children("input[name$='[menuable_id]']").val())
                 commit: (element) ->
-                  if this.getElement().isVisible()
+                  if this.getDialog().getValueOf('item', 'source') == 'Page'
                     element.children('.menu-item').children("input[name$='[menuable_id]']").val(this.getValue())
                     element.children('.menu-item').children("input[name$='[menuable_type]']").val('Effective::Page')
+                  else if this.getDialog().getValueOf('item', 'source') == 'Dropdown'
+                    # Nothing
                   else
                     element.children('.menu-item').children("input[name$='[menuable_id]']").val('')
                     element.children('.menu-item').children("input[name$='[menuable_type]']").val('')
                 validate: ->
-                  if this.getElement().isVisible() && (this.getValue() || '').length == 0
-                    CKEDITOR.dialog.validate.notEmpty('please select a page').apply(this)
+                  if this.getDialog().getValueOf('item', 'source') == 'Page' && (this.getValue() || '').length == 0
+                    if this.getDialog().effective_menu_item.hasClass('dropdown') == false
+                      CKEDITOR.dialog.validate.notEmpty('please select a page').apply(this)
               },
               {
                 id: 'url',
@@ -408,12 +423,13 @@ CKEDITOR.plugins.add 'effective_menus',
                 setup: (element) ->
                   this.setValue(element.children('.menu-item').children("input[name$='[url]']").val())
                 commit: (element) ->
-                  if this.getElement().isVisible() then value = this.getValue() else value = ''
+                  if this.getDialog().getValueOf('item', 'source') == 'URL' then value = this.getValue() else value = ''
 
-                  element.children('.menu-item').children("input[name$='[url]']").val(value)
-                  element.children('a').attr('href', value || '#')
+                  if this.getDialog().getValueOf('item', 'source') != 'Dropdown'
+                    element.children('.menu-item').children("input[name$='[url]']").val(value)
+                    element.children('a').attr('href', value || '#')
                 validate: ->
-                  if this.getElement().isVisible() && (this.getValue() || '').length == 0
+                  if this.getDialog().getValueOf('item', 'source') == 'URL' && (this.getValue() || '').length == 0
                     CKEDITOR.dialog.validate.notEmpty('please enter a URL').apply(this)
               },
               {
@@ -426,8 +442,10 @@ CKEDITOR.plugins.add 'effective_menus',
                   if this.getDialog().getValueOf('item', 'source') == 'Divider'
                     element.children('.menu-item').children("input[name$='[special]']").val('divider')
                     element.children('a').html('')
-                  else if this.getElement().isVisible()
+                  else if this.getDialog().getValueOf('item', 'source') == 'Route'
                     element.children('.menu-item').children("input[name$='[special]']").val(this.getValue())
+                  else if this.getDialog().getValueOf('item', 'source') == 'Dropdown'
+                    # Nothing
                   else
                     element.children('.menu-item').children("input[name$='[special]']").val('')
                   # There is more stuff in the classes commit
@@ -435,9 +453,14 @@ CKEDITOR.plugins.add 'effective_menus',
                   if this.getDialog().getValueOf('item', 'source') == 'Divider'
                     if this.getDialog().effective_menu_item.hasClass('dropdown')
                       CKEDITOR.dialog.validate.notEmpty('cannot convert existing dropdown menu to a Divider').apply(this)
-                  else if this.getElement().isVisible()
+                  else if this.getDialog().getValueOf('item', 'source') == 'Route'
                     if (this.getValue() || '').length == 0
                       CKEDITOR.dialog.validate.notEmpty('please enter a route').apply(this)
+              },
+              {
+                id: 'dropdown',
+                type: 'html',
+                html: 'Dropdown menu items cannot also be links.<br><br>To change this dropdown back to a regular menu item,<br>please click Cancel and then use the drag & drop<br>functionality to remove all its child menu items.'
               }
             ] # /tab1 elements
           },
@@ -455,7 +478,9 @@ CKEDITOR.plugins.add 'effective_menus',
                 onChange: (event) ->
                   if this.getValue() == true
                     this.getDialog().setValueOf('permissions', 'signed_in', false)
-                    this.getDialog().setValueOf('permissions', 'roles_mask', '')
+
+                    for role, index in ((CKEDITOR.config['effective_regions'] || {})['roles'] || [])
+                      this.getDialog().setValueOf('permissions', "role_#{role[1]}", false)
               },
               {
                 id: 'signed_in',
@@ -467,30 +492,50 @@ CKEDITOR.plugins.add 'effective_menus',
                 onChange: (event) ->
                   if this.getValue() == true
                     this.getDialog().setValueOf('permissions', 'signed_out', false)
-              },
+              }
               {
-                id: 'roles_mask',
-                type: 'text',
-                label: 'Roles Mask',
-                setup: (element) ->
-                  value = parseInt(element.children('.menu-item').children("input[name$='[roles_mask]']").val(), 10)
-                  if value > 0 then this.setValue(value) else this.setValue('')
+                id: 'roles',
+                type: 'vbox',
+                width: '100%',
+                children:
+                  [{type: 'html', html: '<p>Only visible when signed in as a user with one or more<br>of the following website roles:</p>'}].concat(
+                    for role, index in ((CKEDITOR.config['effective_regions'] || {})['roles'] || [])
+                      bit_mask = Math.pow(2, index)
+                      # role == [description, title, 'disabled' or null]   We're not using description
+                      {
+                        id: "role_#{role[1]}",
+                        type: 'checkbox',
+                        label: "#{role[1]}",
+                        className: "role_#{bit_mask}_#{role[2]}_box"
+                        setup: (element) ->
+                          this.disable() if (this.className.split('_')[2] == 'disabled')
+
+                          roles_mask = parseInt(element.children('.menu-item').children("input[name$='[roles_mask]']").val(), 10) || 0
+                          roles_mask = 0 if roles_mask == -1
+                          bit_mask = parseInt(this.className.split('_')[1], 10) || 0
+
+                          this.setValue((bit_mask & roles_mask) != 0)
+                        onClick: (event) ->
+                          if this.getValue() == true # Ensure Only visible when signed in is checked too if we have roles
+                            this.getDialog().setValueOf('permissions', 'signed_in', true)
+                            this.getDialog().setValueOf('permissions', 'signed_out', false)
+                      }
+                  )
                 commit: (element) ->
-                  if ('' + this.getValue()).length > 0
-                    element.children('.menu-item').children("input[name$='[roles_mask]']").val(this.getValue())
+                  roles_mask = 0
+
+                  for role, index in ((CKEDITOR.config['effective_regions'] || {})['roles'] || [])
+                    if this.getDialog().getValueOf('permissions', "role_#{role[1]}") == true
+                      roles_mask += Math.pow(2, index)
+
+                  if roles_mask > 0
+                    element.children('.menu-item').children("input[name$='[roles_mask]']").val(roles_mask)
                   else if this.getDialog().getValueOf('permissions', 'signed_in') == true
                     element.children('.menu-item').children("input[name$='[roles_mask]']").val(0)
                   else if this.getDialog().getValueOf('permissions', 'signed_out') == true
                     element.children('.menu-item').children("input[name$='[roles_mask]']").val(-1)
                   else
                     element.children('.menu-item').children("input[name$='[roles_mask]']").val('')
-                onKeyup: (event) ->
-                  if ('' + this.getValue()).length > 0
-                    this.getDialog().setValueOf('permissions', 'signed_in', true)
-                    this.getDialog().setValueOf('permissions', 'signed_out', false)
-                validate: ->
-                  if ('' + this.getValue()).length > 0
-                    CKEDITOR.dialog.validate.integer('roles_mask must be an integer').apply(this)
               }
             ]
           },
@@ -537,11 +582,11 @@ CKEDITOR.plugins.add 'effective_menus',
         onShow: -> this.setupContent(this.effective_menu_item) if this.effective_menu_item
 
         onOk: ->
-          this.commitContent(this.effective_menu_item)
-          this.effective_menu_item.removeClass('new-item') if this.effective_menu_item.hasClass('new-item')
-          this.effective_menu_item = undefined
+          if this.effective_menu_item
+            this.commitContent(this.effective_menu_item)
+            this.effective_menu_item.removeClass('new-item') if this.effective_menu_item.hasClass('new-item')
 
         onCancel: ->
-          this.effective_menu_item.remove() if this.effective_menu_item.hasClass('new-item')
-          this.effective_menu_item = undefined
+          if this.effective_menu_item && this.effective_menu_item.hasClass('new-item')
+            this.effective_menu_item.remove()
       }

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

@@ -108,7 +108,7 @@ Regions = {
 }
 
 Snippets = {
-  all: -> CKEDITOR.config['effective_regions']['snippets']
+  all: -> ((CKEDITOR.config['effective_regions'] || {})['snippets'] || {})
 
   build: (editor, name, values) ->
     snippet = {}
@@ -168,7 +168,7 @@ Snippets = {
 }
 
 Templates = {
-  all: -> CKEDITOR.config['effective_regions']['templates']
+  all: -> ((CKEDITOR.config['effective_regions'] || {})['templates'] || {})
   build: (definition) -> definition
 }
 

data/lib/effective_ckeditor/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCkeditor
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_ckeditor
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails