scrivito_editors 0.41.1 → 0.42.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/app/assets/javascripts/scrivito_editors/link_editor.js.coffee +9 -8
  4. data/app/assets/javascripts/scrivito_editors/linklist_editor.js.coffee +9 -4
  5. data/app/helpers/scrivito_editors/scrivito_tag_helper.rb +3 -2
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 218cf9d934bf928dab54019c5e0fa724c1525531
4
- data.tar.gz: acb729eaab05e3b9e598292a6ccc3652756302cf
3
+ metadata.gz: abef61d1516949cfcb4e074e5cd0631475b66bbf
4
+ data.tar.gz: 405b5ec6b42b548f7d741f0ec9014895c467792b
5
5
  SHA512:
6
- metadata.gz: 1f9f3d55ba7fc11f070c085f5b55463d99f47048eaa6b0d448c227ab125309b22f83ec5320e16f881e5f6c3c9db5b208964f1d0c0e1488ebc07a07a00054d57c
7
- data.tar.gz: 09f2a75bdc34b463b721ce7a9c19c210d018c544782ce6b440e440a108ed024c464a7859c60a32eeea85ba692cb212859c42cd35fd671a0f37296f511c9be7ff
6
+ metadata.gz: ad545cc206f7130d2b9d7f31accc9cb9cf051c78a0f24df91d0ce9c8bfe3665e6331c573cb2e81a239614fa4e0a5af7ffbf9bc187087552bcbd26b1a019db0f2
7
+ data.tar.gz: 853229217579a3147b694d1859c200413f9548ab8917e5158590da0ab112ae1c6086331b0d325f65d05cd4e9980d07e7e41becfbfa3129cf1b04509032847a16
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # v0.42.0
2
+ * Resolved: Link and linklist editors remember selected item when re-opening the content browser.
3
+ * Resolved: Link editor works on empty links, too.
4
+ * Resolved: Internal links with fragments no longer lose the fragment when re-editing.
5
+
1
6
  # v0.41.0
2
7
  * Link and linklist editors initially show description for editor (for internal links).
3
8
 
data/app/assets/javascripts/scrivito_editors/link_editor.js.coffee CHANGED
@@ -62,10 +62,15 @@ $ ->
62
62
 
63
63
  # Resource browser callback for saving a single link.
64
64
  onContentBrowserSaveLinkItem = (selection, linkItem) ->
65
- url = buildUrl(selection[0])
66
- linkItem.find('[name=url]')
67
- .data "value", url
68
- .val "Content browser selection (#{url})"
65
+ id = selection[0]
66
+ return unless id
67
+ url = buildUrl(id)
68
+ val = "Content browser selection (#{url})"
69
+ linkItem
70
+ .data "id", id
71
+ .find('[name=url]')
72
+ .data "value", url
73
+ .val val
69
74
 
70
75
  # trigger save after inserting the value
71
76
  cmsField = getCmsField(linkItem)
@@ -114,9 +119,6 @@ $ ->
114
119
  input.val raw if raw
115
120
  input.data 'value', null
116
121
 
117
- if items.length == 0
118
- cmsField.append(template())
119
-
120
122
  # Automatically save when focus is lost.
121
123
  onBlur = (event) ->
122
124
  cmsField = getCmsField($(event.currentTarget))
@@ -125,7 +127,6 @@ $ ->
125
127
 
126
128
  initialize = (root) ->
127
129
  linkElements = $(root).find('[data-scrivito-field-type="link"]:not([data-editor]), [data-editor="link"]')
128
-
129
130
  if linkElements.length
130
131
  transformLinks(linkElements)
131
132
 
data/app/assets/javascripts/scrivito_editors/linklist_editor.js.coffee CHANGED
@@ -68,10 +68,15 @@ $ ->
68
68
 
69
69
  # Resource browser callback for saving a single link.
70
70
  onContentBrowserSaveLinkItem = (selection, linkItem) ->
71
- url = buildUrl(selection[0])
72
- linkItem.find('[name=url]')
73
- .data "value", url
74
- .val "Content browser selection (#{url})"
71
+ id = selection[0]
72
+ return unless id
73
+ url = buildUrl(id)
74
+ val = "Content browser selection (#{url})"
75
+ linkItem
76
+ .data "id", id
77
+ .find('[name=url]')
78
+ .data "value", url
79
+ .val val
75
80
 
76
81
  # trigger save after inserting the value
77
82
  cmsField = getCmsField(linkItem)
data/app/helpers/scrivito_editors/scrivito_tag_helper.rb CHANGED
@@ -119,7 +119,7 @@ module ScrivitoEditors
119
119
  link = object[attribute_name]
120
120
 
121
121
  scrivito_tag(:div, object, attribute_name, options) do
122
- content_tag(:ul) { _edit_link_li(link) } if link
122
+ content_tag(:ul) { _edit_link_li(link || Scrivito::Link.new(url: "")) }
123
123
  end
124
124
  end
125
125
 
@@ -127,7 +127,8 @@ module ScrivitoEditors
127
127
 
128
128
  def _edit_link_li(link)
129
129
  query = link.query.present? ? "?#{link.query}" : ""
130
- url = link.internal? ? scrivito_path(link).sub(/\?.*/, query) : link.url
130
+ fragment = link.fragment.present? ? "##{link.fragment}" : ""
131
+ url = link.internal? ? scrivito_path(link).sub(/\?.*/, "#{query}#{fragment}") : link.url
131
132
  description = link.internal? ? link.obj.description_for_editor : link.url
132
133
  data = { description: description, title: link.title, url: url }
133
134
  data[:id] = link.obj.id if link.internal?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scrivito_editors
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.41.1
4
+ version: 0.42.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scrivito
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-12 00:00:00.000000000 Z
11
+ date: 2015-02-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: coffee-rails
@@ -58,28 +58,28 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.41.1
61
+ version: 0.42.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 0.41.1
68
+ version: 0.42.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: scrivito_sdk
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 0.41.1
75
+ version: 0.42.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 0.41.1
82
+ version: 0.42.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: pry
85
85
  requirement: !ruby/object:Gem::Requirement