Merge branch 'development'

Dolphiq · Aug 7, 2018 · 0f51aea · 0f51aea
2 parents efadc13 + 3187e16
commit 0f51aea
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+
+## 1.0.5 - 2018-08-07
+
+### Changed
+- Added a 'remove icon' button, so you can remove the selected icon
+- Fixed a bug that prevented the iconpicker modal from appearing when using the iconpicker field in a matrix field
+
 ## 1.0.4 - 2017-12-14
 
 ### Changed
@@ -16,4 +23,4 @@
 - Added resource links to download font packages
 
 ## 1.0.2 - 2017-09-06
-- Initial release 
+- Initial release 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "dolphiq/iconpicker",
   "description": "Craft Iconpicker field type that offers end-users an easy way to pick an icon/symbol from a .woff or .ttf font file.",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/resources-app/js/IconpickerModal.js b/src/resources-app/js/IconpickerModal.js
@@ -65,6 +65,7 @@ Craft.IconpickerModal = Garnish.Modal.extend(
     selectIcon: function(){
       $(this.iconField).find('.iconpicker-icon').val(this.icon);
       $(this.iconField).find('.iconpicker-msg').removeClass('dolphiq-iconpicker--empty');
+      $(this.iconField).find('.iconpickerField_removeicon').removeClass('dolphiq-iconpicker--empty');
       $(this.iconField).find('.iconpicker-msg .iconpicker-preview').html('&#x'+(parseInt(this.icon).toString(16))+';');
       $(this.iconField).find('.iconpicker-msg .iconpicker-code').html((parseInt(this.icon).toString(16)));
       this.hide();

diff --git a/src/resources-app/js/field.js b/src/resources-app/js/field.js
@@ -5,7 +5,7 @@ $(function() {
 
   var iconpickerField_modals = [];
 
-  $('.iconpickerField_modaltoggle').on('click', function(){
+  $(document).on('click', '.iconpickerField_modaltoggle', function(){
     var p = $(this).parent();
     if(p.data('modal-id') !== undefined){
       iconpickerField_modals[p.data('modal-id')].show();
@@ -18,7 +18,17 @@ $(function() {
   });
 
   // Close visible modal when clicking on close button
-  $('document').on('click', '.locationField_modal_close', function(){
+  $(document).on('click', '.locationField_modal_close', function(){
     Garnish.Modal.visibleModal.hide();
   });
-});
+
+  // Remove the selected icon
+  $(document).on('click', '.iconpickerField_removeicon', function(){
+    var p = $(this).parent();
+    $(p).find('.iconpicker-icon').val('');
+    $(p).find('.iconpicker-msg .iconpicker-preview').html('');
+    $(p).find('.iconpicker-msg .iconpicker-code').html('');
+    $(p).find('.iconpicker-msg').addClass('dolphiq-iconpicker--empty');
+    $(this).addClass('dolphiq-iconpicker--empty');
+  });
+});
diff --git a/src/views/main/_field.php b/src/views/main/_field.php
@@ -31,6 +31,7 @@
     </span>
   </p>
   <button class="iconpickerField_modaltoggle btn" type="button">Pick an icon</button>
+  <button class="iconpickerField_removeicon btn <?= empty($value->icon) ? 'dolphiq-iconpicker--empty' : ''?>" type="button">Remove icon</button>
 
   <div class="modal iconpickerField_modal elementselectormodal" style="display: none" id="<?= $name; ?>_modal">
     <div class="body">
@@ -64,4 +65,4 @@
                   ?>
     <p>There is no font uploaded to the font folder of this plugin, no font selected in the field settings, or the font contains no icons</p>
 <?php
-              } ?>
+              } ?>