scrivito_editors 0.40.0.rc1 → 0.40.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1 -0
  3. data/app/assets/javascripts/scrivito_editors/link_editor.js.coffee +4 -2
  4. data/app/assets/javascripts/scrivito_editors/linklist_editor.js.coffee +4 -2
  5. data/app/assets/javascripts/scrivito_editors/reference_editor.js.coffee +1 -1
  6. data/app/helpers/scrivito_editors/scrivito_tag_helper.rb +3 -1
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8ee8ba53124594687ab57e326d34f7db19835e7c
4
- data.tar.gz: 7aefd595e343fedaee934a2172c7bec4d9a4f0bb
3
+ metadata.gz: d30bdacab196ff1b89a3e7820909ec01b30a991a
4
+ data.tar.gz: 3eaf8ae2fa85b6a97a6d6fc62acb0975d6febb12
5
5
  SHA512:
6
- metadata.gz: c1e98b98065a156cdc4bcd2ff9e0b7db9ff05324003a1fead0dbff42f596e3eb1277ce04209c8a98e9c2d230d2ddfb3063d7f3cde00e583eb65018f97d1f98e2
7
- data.tar.gz: f2b5ba14dff9b1e194b14dcc195774376e4e32bf86531194146c626808e1bd4c0638b1742087f3b0e3c309875e84c08fde6095223fc1624b3096d31c8cd39228
6
+ metadata.gz: 534a4459063a7d36d84d2d280ef18689291649d04f23006747219dc4545a21ace1e5a8f2ea4c6e6b868bd148d4917568dec53a06b02b8f85e73f2b3e5ee4bce1
7
+ data.tar.gz: 9de2ed83886f436e5f09eba4f7f9900d47bb75d0b22ec4e60b57e4d9b377b2cd644989adb16eeaa238318a7e2810292f7fdc1d66c6069209172f44ac9eaca0d1
data/CHANGELOG.md CHANGED
@@ -4,6 +4,7 @@
4
4
  `scrivito.editors.html_editor.redactor.options = { buttonSource: true }`
5
5
  * Resolved: Markup will now stay unchanged when the editor is closed without editing.
6
6
  * Resolved: Cursor will now appear at the point of clicking, if possible. Otherwise at the end.
7
+ * Resolved: Link editor shows current selection when opening the content browser.
7
8
 
8
9
  # v0.30.1
9
10
  * Resolved issue: Date editor keeps time when editing
data/app/assets/javascripts/scrivito_editors/link_editor.js.coffee CHANGED
@@ -49,11 +49,13 @@ $ ->
49
49
  linkItem = $(event.currentTarget).closest('li')
50
50
  cmsField = getCmsField(linkItem)
51
51
  filters = cmsField.data('filters') || cmsField.data('filter')
52
+ id = linkItem.data('id')
53
+ selection = if id then [id] else []
52
54
 
53
55
  scrivito.content_browser.open
54
- selection: []
56
+ selection: selection
55
57
  filters: filters
56
- selectionMode: 'single'
58
+ selection_mode: 'single'
57
59
  .done (selection) =>
58
60
  onContentBrowserSaveLinkItem(selection, linkItem)
59
61
 
data/app/assets/javascripts/scrivito_editors/linklist_editor.js.coffee CHANGED
@@ -54,11 +54,13 @@ $ ->
54
54
  linkItem = $(event.currentTarget).closest('li')
55
55
  cmsField = getCmsField(linkItem)
56
56
  filters = cmsField.data('filters') || cmsField.data('filter')
57
+ id = linkItem.data('id')
58
+ selection = if id then [id] else []
57
59
 
58
60
  scrivito.content_browser.open
59
- selection: []
61
+ selection: selection
60
62
  filters: filters
61
- selectionMode: 'single'
63
+ selection_mode: 'single'
62
64
  .done (selection) =>
63
65
  onContentBrowserSaveLinkItem(selection, linkItem)
64
66
 
data/app/assets/javascripts/scrivito_editors/reference_editor.js.coffee CHANGED
@@ -14,7 +14,7 @@ $ ->
14
14
  scrivito.content_browser.open
15
15
  selection: selected
16
16
  filters: filters
17
- selectionMode: 'single'
17
+ selection_mode: 'single'
18
18
 
19
19
  .done (selection) =>
20
20
  onContentBrowserSave(selection, cmsField)
data/app/helpers/scrivito_editors/scrivito_tag_helper.rb CHANGED
@@ -129,8 +129,10 @@ module ScrivitoEditors
129
129
  query = link.query.present? ? "?#{link.query}" : ""
130
130
  url = link.internal? ? scrivito_path(link).sub(/\?.*/, query) : link.url
131
131
  description = link.internal? ? link.obj.description_for_editor : link.url
132
+ data = { title: link.title, url: url }
133
+ data[:id] = link.obj.id if link.internal?
132
134
 
133
- content_tag(:li, data: { title: link.title, url: url }) do
135
+ content_tag(:li, data: data) do
134
136
  content_tag(:span, class: 'list-content') do
135
137
  "#{link.title} #{link_to(description, url, target: :_blank)}".html_safe
136
138
  end
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.40.0.rc1
4
+ version: 0.40.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scrivito
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-14 00:00:00.000000000 Z
11
+ date: 2015-01-23 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.40.0.rc1
61
+ version: 0.40.0.rc2
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.40.0.rc1
68
+ version: 0.40.0.rc2
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.40.0.rc1
75
+ version: 0.40.0.rc2
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.40.0.rc1
82
+ version: 0.40.0.rc2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: pry
85
85
  requirement: !ruby/object:Gem::Requirement