scrivito_editors 0.42.1 → 0.50.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 621b32697917c93efc30ea51c07ace9a4943e56e
4
- data.tar.gz: df603ac8e8dfd50ae5b3ed47d43f58e59e337b64
3
+ metadata.gz: c4459e50d4b8cab4e1c3de5bdfb7146ead544214
4
+ data.tar.gz: a5673b3204a7bafb8ba407c9e2ae5b6e3f951c55
5
5
  SHA512:
6
- metadata.gz: 7e5fb79075481221841ff40003d9f16a3bc1b0a0ea16576480774b5562273cb9d3fb2f92e5f3e172d082f12aeddffecbe7a71561aa6ff9c2902f0c305cf4fe1c
7
- data.tar.gz: e043fe43278baf781d2458969f8cf67376a45404ee9a59765993f3135cb07fd8ee6e8aece81b9f3c3cc7dd1ec354da8ad545f743e934cf843f16bd650dca7fdc
6
+ metadata.gz: 0055dca22d05115cfec8df75fa92b590c9a63b67e17ae3168eb9d005b58b5e8a6bd3ae4b552ba8f64d8cf24a93346127b8740f9a9546bfcf998993705aea7d53
7
+ data.tar.gz: cc3aee102c2ffceaa7a9f90a720f8dcc3bef9a8e6ca3a96a3a58ab580a4cc8b649a26214eb8c9bad65cd5971b85941a71e2f5d81a9d024d684d6952ba4c518ae
@@ -1,3 +1,7 @@
1
+ # v0.50.0
2
+ * When using the HTML editor, you can now insert an image by browsing.
3
+ * When using the HTML editor, you can now browse content when inserting a link.
4
+
1
5
  # v0.42.0
2
6
  * Resolved: Link and linklist editors remember selected item when re-opening the content browser.
3
7
  * Resolved: Link editor works on empty links, too.
@@ -21,18 +21,22 @@ $ ->
21
21
  scrivito.editors.html_editor.redactor.default_options =
22
22
  buttons: [
23
23
  'formatting', 'bold', 'italic', 'deleted', 'underline',
24
- 'unorderedlist', 'orderedlist', 'table', 'link', 'html',
24
+ 'unorderedlist', 'orderedlist', 'table', 'image', 'link', 'html',
25
25
  ]
26
26
 
27
27
  buttonSource: true
28
28
  cleanSpaces: false
29
29
  cleanOnPaste: false
30
30
  convertLinks: false
31
+ imageUpload: true # dummy, to enable scrivito_editors_image_manager
31
32
  linkTooltip: false # disabled, causes unexpected blur on redactor 9 and 10
32
33
  paragraphize: false
34
+ placeholder: false
33
35
 
34
36
  plugins: [
35
37
  'scrivito_editors_close'
38
+ 'scrivito_editors_image_manager'
39
+ 'scrivito_editors_link_manager'
36
40
  'table'
37
41
  ]
38
42
 
@@ -0,0 +1,18 @@
1
+ @RedactorPlugins ?= {}
2
+
3
+ $ ->
4
+ RedactorPlugins.scrivito_editors_image_manager = -> self =
5
+ init: ->
6
+ @modal.addCallback 'image', self.browse
7
+
8
+ browse: ->
9
+ scrivito.content_browser.open
10
+ selection_mode: 'single'
11
+ .done (selection) =>
12
+ id = selection[0]
13
+ self.insert id if id?
14
+ .always =>
15
+ @modal.close()
16
+
17
+ insert: (id) ->
18
+ @image.insert "<img src='/#{id}'>"
@@ -0,0 +1,47 @@
1
+ @RedactorPlugins ?= {}
2
+
3
+ $ ->
4
+ RedactorPlugins.scrivito_editors_link_manager = -> self =
5
+ init: ->
6
+ @modal.addTemplate 'scrivito_link_manager_browse', self.browseButtonHtml
7
+ @modal.addTemplate 'scrivito_link_manager_url', '/$id'
8
+ @modal.addCallback 'imageEdit', self.addBrowseToModal
9
+ @modal.addCallback 'link', self.addBrowseToModal
10
+
11
+ browseButtonHtml: """
12
+ <button class="editing-button editing-green">
13
+ <i class="editing-icon editing-icon-search"></i>
14
+ Browse
15
+ </button>
16
+ """
17
+
18
+ urlInput: ->
19
+ @modal.getModal().find '#redactor-link-url, #redactor-image-link'
20
+
21
+ addBrowseToModal: ->
22
+ self.urlInput()
23
+ .wrap '<div id="scrivito-link-manager-url"></div>'
24
+ .after @modal.getTemplate 'scrivito_link_manager_browse'
25
+ .siblings 'button'
26
+ .on 'click', self.browse
27
+
28
+ browse: ->
29
+ scrivito.content_browser.open
30
+ selection: self.getObjIds()
31
+ selection_mode: 'single'
32
+ .done (selection) =>
33
+ id = selection[0]
34
+ self.setObjId id if id?
35
+
36
+ getObjIds: ->
37
+ matches = self.urlInput()
38
+ .val()
39
+ .match(/[\/:]([a-f0-9]{16})\b/)
40
+ if matches? then [matches[1]] else []
41
+
42
+ setObjId: (id) ->
43
+ self.urlInput()
44
+ .val self.toUrl id
45
+
46
+ toUrl: (id) ->
47
+ @modal.getTemplate('scrivito_link_manager_url').replace("$id", id)
@@ -12,6 +12,5 @@
12
12
  *= require jquery-ui/slider
13
13
  *= require jquery-ui-timepicker-addon.min
14
14
  *= require redactor
15
- *= require scrivito_content_browser
16
15
  *= require_tree .
17
16
  */
@@ -1,3 +1,19 @@
1
+ /*
2
+ Redactor styles with Scrivito wash
3
+ */
4
+
5
+ #redactor-modal footer button.redactor-modal-action-btn {
6
+ background-color: #658B51;
7
+ }
8
+
9
+ #redactor-modal footer button.redactor-modal-action-btn:hover {
10
+ background-color: #7EA46A;
11
+ }
12
+
13
+ #redactor-modal-box {
14
+ z-index: 11111 !important;
15
+ }
16
+
1
17
  /*
2
18
  Plugin styles for the close button.
3
19
  */
@@ -19,3 +35,26 @@
19
35
  .redactor-toolbar li a.re-close:hover:not(.redactor-button-disabled) {
20
36
  color: #fff;
21
37
  }
38
+
39
+ /*
40
+ Plugin styles for the content browser integration
41
+ */
42
+
43
+ #redactor-modal #scrivito-link-manager-url {
44
+ position: relative;
45
+ }
46
+
47
+ #redactor-modal #scrivito-link-manager-url input {
48
+ padding-right: 100px;
49
+ }
50
+
51
+ #redactor-modal #scrivito-link-manager-url button {
52
+ position: absolute;
53
+ border-radius: 0;
54
+ margin: 0;
55
+ z-index: 2;
56
+ top: 0;
57
+ right: 0;
58
+ bottom: 0;
59
+ line-height: 1px;
60
+ }
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.42.1
4
+ version: 0.50.0.rc1
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-24 00:00:00.000000000 Z
11
+ date: 2015-03-06 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.42.1
61
+ version: 0.50.0.rc1
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.42.1
68
+ version: 0.50.0.rc1
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.42.1
75
+ version: 0.50.0.rc1
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.42.1
82
+ version: 0.50.0.rc1
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: pry
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,8 @@ files:
149
149
  - app/assets/javascripts/scrivito_editors/linklist_editor.js.coffee
150
150
  - app/assets/javascripts/scrivito_editors/multienum_editor.js.coffee
151
151
  - app/assets/javascripts/scrivito_editors/placeholder.js.coffee
152
+ - app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_image_manager.js.coffee
153
+ - app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_link_manager.js.coffee
152
154
  - app/assets/javascripts/scrivito_editors/redactor_plugins/table.js
153
155
  - app/assets/javascripts/scrivito_editors/reference_editor.js.coffee
154
156
  - app/assets/javascripts/scrivito_editors/referencelist_editor.js.coffee