pageflow 14.1.0 → 14.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26efef4a8054a381429f740caba05bcd9478e6051c513d122169851841f8075a
-  data.tar.gz: ad96598509d90638857b6434bff2f31cb83563a2291aba9adc40537415d86202
+  metadata.gz: 0281490fd7cce97b5ed370a95141dddeb8c90e40a931e615624594fa8a34732f
+  data.tar.gz: 1f75409ce5ddb34237fe4ce2bc99834bf883fd3da1fd23a9489bdbac508ef591
 SHA512:
-  metadata.gz: e98f4d0a5071282045e89bc9ac92d4654d6868b974237e755d6b1206048791c30f5768830ba54aeafcb7c3991b7ae328ce4fe9fadf2495d6bc515c16cb357553
-  data.tar.gz: f3322825d98421689c84aba34d8a40113768f8bba6bacad5728b9748e48ae86689c56a73faadbee19d4017c4ce20c16a29dc002f74583e3eebb63032efbd02dc
+  metadata.gz: 4c3a714d72d248daab8fdeddcb1756f67ffb6777a83ba582ae4002f609507940255eec4b1cf688c20be29f8d030ab0432994ce14ef4598bf56d7e76aa6268c26
+  data.tar.gz: 17857811e40541260c67c210ff52e374dc86703458b6991e9a9aa3fca435b9ea5fab97330d7c4add15daa9c3b9fcce75310126e6106a253c7a4fe7eab7a919f7

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
-  
+### Version 14.1.1
+
+2019-05-20
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v14.1.0...v14.1.1)
+
+- Ensure remove link button is show in text editor (14.1 Backport)
+  ([#1162](https://github.com/codevise/pageflow/pull/1162))
+
 ### Version 14.1.0
 
 2019-05-20

data/app/assets/javascripts/pageflow/ui/templates/inputs/text_area_input.jst.ejs

@@ -10,11 +10,11 @@
   <a data-wysihtml5-command="bold" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.bold') %>"></a>
   <a data-wysihtml5-command="italic" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.italic') %>"></a>
   <a data-wysihtml5-command="underline" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.underline') %>"></a>
-  <a data-wysihtml5-command="createLink" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.create_link') %>"></a>
+  <a data-wysihtml5-command="createLink" class="link_button" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.create_link') %>"></a>
   <a data-wysihtml5-command="insertOrderedList" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.insert_ordered_list') %>"></a>
   <a data-wysihtml5-command="insertUnorderedList" title="<%= I18n.t('pageflow.ui.templates.inputs.text_area_input.insert_unordered_list') %>"></a>
 
-  <div data-wysihtml5-dialog="createLink" class="dialog" style="display: none;">
+  <div data-wysihtml5-dialog="createLink" class="dialog link_dialog" style="display: none;">
     <div class="link_type_select">
       <label>
         <input type="radio" name="link_type" class="url_link_radio_button">

data/app/assets/javascripts/pageflow/ui/views/inputs/text_area_input_view.js

@@ -34,6 +34,9 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
     input: 'textarea',
     toolbar: '.toolbar',
 
+    linkButton: '.link_button',
+    linkDialog: '.link_dialog',
+
     urlInput: '.current_url',
     targetInput: '.current_target',
 
@@ -103,7 +106,7 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
       this.ui.toolbar.find('a[data-wysihtml5-command="insertOrderedList"]').hide();
       this.ui.toolbar.find('a[data-wysihtml5-command="insertUnorderedList"]').hide();
     }
-    
+
     if (this.options.disableLinks) {
       this.ui.toolbar.find('a[data-wysihtml5-command="createLink"]').hide();
     }
@@ -130,6 +133,9 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
 
   setupUrlLinkPanel: function() {
     this.editor.on('show:dialog', _.bind(function() {
+      this.ui.linkDialog.toggleClass('for_existing_link',
+                                     this.ui.linkButton.hasClass('wysihtml5-command-active'));
+
       var currentUrl = this.ui.urlInput.val();
 
       if (currentUrl.startsWith('#')) {

data/app/assets/stylesheets/pageflow/editor/wysihtml5.scss

@@ -48,15 +48,15 @@
 
   [data-wysihtml5-command="createLink"] {
     @include link-icon;
+  }
 
-    &.wysihtml5-command-active + .dialog {
-      [data-wysihtml5-dialog-action="cancel"] {
-        display: none;
-      }
+  .link_dialog.for_existing_link {
+    [data-wysihtml5-dialog-action="cancel"] {
+      display: none;
+    }
 
-      [data-wysihtml5-command="removeLink"] {
-        display: block;
-      }
+    [data-wysihtml5-command="removeLink"] {
+      display: block;
     }
   }
 

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '14.1.0'.freeze
+  VERSION = '14.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 14.1.1
 platform: ruby
 authors:
 - Codevise Solutions Ltd
@@ -2091,7 +2091,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Multimedia story telling for the web.