Browse Source

Fix icon align

Giuseppe Di Terlizzi 7 years ago
parent
commit
823c54c629
13 changed files with 14 additions and 18 deletions
  1. 2 6
      exe/popup.php
  2. 1 1
      syntax/breeze.php
  3. 1 1
      syntax/fa.php
  4. 1 1
      syntax/fl.php
  5. 1 1
      syntax/flag.php
  6. 1 1
      syntax/fugue.php
  7. 1 1
      syntax/glyphicon.php
  8. 1 1
      syntax/icon.php
  9. 1 1
      syntax/material.php
  10. 1 1
      syntax/oxygen.php
  11. 1 1
      syntax/ra.php
  12. 1 1
      syntax/silk.php
  13. 1 1
      syntax/typcn.php

+ 2 - 6
exe/popup.php

@@ -149,10 +149,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
         var syntax = [ '{{' ];
 
-        if ( icon_align == 'right' || icon_align == 'center') {
-          syntax.push(' ');
-        }
-
         syntax.push(icon_pack);
         syntax.push('>' + icon_name);
 
@@ -174,8 +170,8 @@ header('X-UA-Compatible: IE=edge,chrome=1');
           syntax.push('?' + icon_size_pixel);
         }
 
-        if ( icon_align == 'left' || icon_align == 'center') {
-          syntax.push(' ');
+        if (icon_align) {
+          syntax.push('&align=' + icon_align);
         }
 
         syntax.push('}}');

+ 1 - 1
syntax/breeze.php

@@ -17,7 +17,7 @@ class syntax_plugin_icons_breeze extends syntax_plugin_icons_icon {
   const IS_ICON      = true;
   const IS_FONT_ICON = false;
 
-  protected $pattern = '{{breeze>.+?}}|{{\sbreeze>.+?}}';
+  protected $pattern = '{{breeze>.+?}}';
 
   public static function makePath($icon, $size, $base_url) {
 

+ 1 - 1
syntax/fa.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_fa extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{fa>.+?}}|{{\sfa>.+?}}';
+  protected $pattern = '{{fa>.+?}}';
 
 }

+ 1 - 1
syntax/fl.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_fl extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{fl>.+?}}|{{\sfl>.+?}}';
+  protected $pattern = '{{fl>.+?}}';
 
 }

+ 1 - 1
syntax/flag.php

@@ -17,7 +17,7 @@ class syntax_plugin_icons_flag extends syntax_plugin_icons_icon {
   const IS_ICON      = true;
   const IS_FONT_ICON = false;
 
-  protected $pattern = '{{flag>.+?}}|{{\sflag>.+?}}';
+  protected $pattern = '{{flag>.+?}}';
 
   public static function makePath($icon, $size, $base_url) {
 

+ 1 - 1
syntax/fugue.php

@@ -17,7 +17,7 @@ class syntax_plugin_icons_fugue extends syntax_plugin_icons_icon {
   const IS_ICON      = true;
   const IS_FONT_ICON = false;
 
-  protected $pattern = '{{fugue>.+?}}|{{\sfugue>.+?}}';
+  protected $pattern = '{{fugue>.+?}}';
 
   public static function makePath($icon, $size, $base_url) {
 

+ 1 - 1
syntax/glyphicon.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_glyphicon extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{glyphicon>.+?}}|{{\sglyphicon>.+?}}';
+  protected $pattern = '{{glyphicon>.+?}}';
 
 }

+ 1 - 1
syntax/icon.php

@@ -15,7 +15,7 @@ class syntax_plugin_icons_icon extends DokuWiki_Syntax_Plugin {
   const IS_ICON      = null;
   const IS_FONT_ICON = null;
 
-  protected $pattern     = '{{icon>.+?}}|{{\sicon>.+?}}';
+  protected $pattern     = '{{icon>.+?}}';
   protected $linkPattern = '\[\[[^\]\r\n]*\|%s\]\]';
 
   protected $flags   = array();

+ 1 - 1
syntax/material.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_material extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{material>.+?}}|{{\smaterial>.+?}}';
+  protected $pattern = '{{material>.+?}}';
 
 }

+ 1 - 1
syntax/oxygen.php

@@ -17,7 +17,7 @@ class syntax_plugin_icons_oxygen extends syntax_plugin_icons_icon {
   const IS_ICON      = true;
   const IS_FONT_ICON = false;
 
-  protected $pattern = '{{oxygen>.+?}}|{{\soxygen>.+?}}';
+  protected $pattern = '{{oxygen>.+?}}';
 
   public static function makePath($icon, $size, $base_url) {
 

+ 1 - 1
syntax/ra.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_ra extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{ra>.+?}}|{{\sra>.+?}}';
+  protected $pattern = '{{ra>.+?}}';
 
 }

+ 1 - 1
syntax/silk.php

@@ -17,7 +17,7 @@ class syntax_plugin_icons_silk extends syntax_plugin_icons_icon {
     const IS_ICON      = true;
     const IS_FONT_ICON = false;
 
-    protected $pattern = '{{silk>.+?}}|{{\ssilk>.+?}}';
+    protected $pattern = '{{silk>.+?}}';
 
     public static function makePath($icon, $size, $base_url) {
       return "$base_url/$icon-icon.png";

+ 1 - 1
syntax/typcn.php

@@ -17,6 +17,6 @@ class syntax_plugin_icons_typcn extends syntax_plugin_icons_icon {
   const IS_ICON      = false;
   const IS_FONT_ICON = true;
 
-  protected $pattern = '{{typcn>.+?}}|{{\stypcn>.+?}}';
+  protected $pattern = '{{typcn>.+?}}';
 
 }