pageflow 14.1.0 → 14.1.1

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -1
  3. data/app/assets/javascripts/pageflow/ui/templates/inputs/text_area_input.jst.ejs +2 -2
  4. data/app/assets/javascripts/pageflow/ui/views/inputs/text_area_input_view.js +7 -1
  5. data/app/assets/stylesheets/pageflow/editor/wysihtml5.scss +7 -7
  6. data/lib/pageflow/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 26efef4a8054a381429f740caba05bcd9478e6051c513d122169851841f8075a
4
- data.tar.gz: ad96598509d90638857b6434bff2f31cb83563a2291aba9adc40537415d86202
3
+ metadata.gz: 0281490fd7cce97b5ed370a95141dddeb8c90e40a931e615624594fa8a34732f
4
+ data.tar.gz: 1f75409ce5ddb34237fe4ce2bc99834bf883fd3da1fd23a9489bdbac508ef591
5
5
  SHA512:
6
- metadata.gz: e98f4d0a5071282045e89bc9ac92d4654d6868b974237e755d6b1206048791c30f5768830ba54aeafcb7c3991b7ae328ce4fe9fadf2495d6bc515c16cb357553
7
- data.tar.gz: f3322825d98421689c84aba34d8a40113768f8bba6bacad5728b9748e48ae86689c56a73faadbee19d4017c4ce20c16a29dc002f74583e3eebb63032efbd02dc
6
+ metadata.gz: 4c3a714d72d248daab8fdeddcb1756f67ffb6777a83ba582ae4002f609507940255eec4b1cf688c20be29f8d030ab0432994ce14ef4598bf56d7e76aa6268c26
7
+ data.tar.gz: 17857811e40541260c67c210ff52e374dc86703458b6991e9a9aa3fca435b9ea5fab97330d7c4add15daa9c3b9fcce75310126e6106a253c7a4fe7eab7a919f7
data/CHANGELOG.md CHANGED
@@ -1,6 +1,14 @@
1
1
  # CHANGELOG
2
2
 
3
-
3
+ ### Version 14.1.1
4
+
5
+ 2019-05-20
6
+
7
+ [Compare changes](https://github.com/codevise/pageflow/compare/v14.1.0...v14.1.1)
8
+
9
+ - Ensure remove link button is show in text editor (14.1 Backport)
10
+ ([#1162](https://github.com/codevise/pageflow/pull/1162))
11
+
4
12
  ### Version 14.1.0
5
13
 
6
14
  2019-05-20
data/app/assets/javascripts/pageflow/ui/templates/inputs/text_area_input.jst.ejs CHANGED
@@ -10,11 +10,11 @@
10
10
  <a data-wysihtml5-command="bold" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.bold') %>"></a>
11
11
  <a data-wysihtml5-command="italic" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.italic') %>"></a>
12
12
  <a data-wysihtml5-command="underline" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.underline') %>"></a>
13
- <a data-wysihtml5-command="createLink" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.create_link') %>"></a>
13
+ <a data-wysihtml5-command="createLink" class="link_button" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.create_link') %>"></a>
14
14
  <a data-wysihtml5-command="insertOrderedList" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.insert_ordered_list') %>"></a>
15
15
  <a data-wysihtml5-command="insertUnorderedList" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.insert_unordered_list') %>"></a>
16
16
 
17
- <div data-wysihtml5-dialog="createLink" class="dialog" style="display: none;">
17
+ <div data-wysihtml5-dialog="createLink" class="dialog link_dialog" style="display: none;">
18
18
  <div class="link_type_select">
19
19
  <label>
20
20
  <input type="radio" name="link_type" class="url_link_radio_button">
data/app/assets/javascripts/pageflow/ui/views/inputs/text_area_input_view.js CHANGED
@@ -34,6 +34,9 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
34
34
  input: 'textarea',
35
35
  toolbar: '.toolbar',
36
36
 
37
+ linkButton: '.link_button',
38
+ linkDialog: '.link_dialog',
39
+
37
40
  urlInput: '.current_url',
38
41
  targetInput: '.current_target',
39
42
 
@@ -103,7 +106,7 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
103
106
  this.ui.toolbar.find('a[data-wysihtml5-command="insertOrderedList"]').hide();
104
107
  this.ui.toolbar.find('a[data-wysihtml5-command="insertUnorderedList"]').hide();
105
108
  }
106
-
109
+
107
110
  if (this.options.disableLinks) {
108
111
  this.ui.toolbar.find('a[data-wysihtml5-command="createLink"]').hide();
109
112
  }
@@ -130,6 +133,9 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
130
133
 
131
134
  setupUrlLinkPanel: function() {
132
135
  this.editor.on('show:dialog', _.bind(function() {
136
+ this.ui.linkDialog.toggleClass('for_existing_link',
137
+ this.ui.linkButton.hasClass('wysihtml5-command-active'));
138
+
133
139
  var currentUrl = this.ui.urlInput.val();
134
140
 
135
141
  if (currentUrl.startsWith('#')) {
data/app/assets/stylesheets/pageflow/editor/wysihtml5.scss CHANGED
@@ -48,15 +48,15 @@
48
48
 
49
49
  [data-wysihtml5-command="createLink"] {
50
50
  @include link-icon;
51
+ }
51
52
 
52
- &.wysihtml5-command-active + .dialog {
53
- [data-wysihtml5-dialog-action="cancel"] {
54
- display: none;
55
- }
53
+ .link_dialog.for_existing_link {
54
+ [data-wysihtml5-dialog-action="cancel"] {
55
+ display: none;
56
+ }
56
57
 
57
- [data-wysihtml5-command="removeLink"] {
58
- display: block;
59
- }
58
+ [data-wysihtml5-command="removeLink"] {
59
+ display: block;
60
60
  }
61
61
  }
62
62
 
data/lib/pageflow/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Pageflow
2
- VERSION = '14.1.0'.freeze
2
+ VERSION = '14.1.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pageflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 14.1.0
4
+ version: 14.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Codevise Solutions Ltd
@@ -2091,7 +2091,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
2091
2091
  version: '0'
2092
2092
  requirements: []
2093
2093
  rubyforge_project:
2094
- rubygems_version: 2.7.8
2094
+ rubygems_version: 2.7.5
2095
2095
  signing_key:
2096
2096
  specification_version: 4
2097
2097
  summary: Multimedia story telling for the web.