Merge branch 'hotfix/emojione-errors'

meanbee · Dec 13, 2016 · a93eac3 · a93eac3
2 parents 9f92e8b + ad3067b
commit a93eac3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/Meanbee_Shippingrules.xml b/Meanbee_Shippingrules.xml
@@ -1,5 +1,5 @@
 <_>
-   <form_key>S3yQt5lhMlOa0os5</form_key>
+   <form_key>j3zRvmiHpifEPp3W</form_key>
    <name>Meanbee_Shippingrules</name>
    <channel>community</channel>
    <version_ids>
@@ -9,9 +9,9 @@
    <description>Provides a GUI, similar to the one for shopping and catalogue promotion rules, to specifying shipping rates for your customers.</description>
    <license>Commercial License</license>
    <license_uri/>
-   <version>2.7.2</version>
+   <version>2.7.4</version>
    <stability>stable</stability>
-   <notes>* Allow postal code prefix conditions to accept a comma-separated list of values through the use of &apos;is one of&apos;.</notes>
+   <notes>* Bugfixes for Emojione</notes>
    <authors>
       <name>
          <name>Meanbee</name>
@@ -24,7 +24,7 @@
       </email>
    </authors>
    <depends_php_min>5.2.0</depends_php_min>
-   <depends_php_max>6.0.0</depends_php_max>
+   <depends_php_max>7.2.0</depends_php_max>
    <depends>
       <package>
          <name>
@@ -40,7 +40,7 @@
             <max/>
          </max>
          <files>
-            <files>                         </files>
+            <files>                                          </files>
          </files>
       </package>
       <extension>
@@ -66,6 +66,8 @@
          <target>mageweb</target>
          <target>mageweb</target>
          <target>magelib</target>
+         <target>mageskin</target>
+         <target>mageskin</target>
       </target>
       <path>
          <path/>
@@ -77,6 +79,8 @@
          <path>js/meanbee/shippingrules/grid.js</path>
          <path>js/meanbee/shippingrules/postalcode_formats.json</path>
          <path>Emojione</path>
+         <path>adminhtml/base/default/meanbee/shippingrules/</path>
+         <path>adminhtml/default/default/lib/emojione/</path>
       </path>
       <type>
          <type>file</type>
@@ -88,6 +92,8 @@
          <type>file</type>
          <type>file</type>
          <type>dir</type>
+         <type>dir</type>
+         <type>dir</type>
       </type>
       <include>
          <include/>
@@ -99,6 +105,8 @@
          <include/>
          <include/>
          <include/>
+         <include/>
+         <include/>
       </include>
       <ignore>
          <ignore/>
@@ -110,10 +118,8 @@
          <ignore/>
          <ignore/>
          <ignore/>
+         <ignore/>
+         <ignore/>
       </ignore>
    </contents>
-   <page>1</page>
-   <limit>200</limit>
-   <folder/>
-   <package/>
 </_>
diff --git a/app/code/community/Meanbee/Shippingrules/Helper/Config.php b/app/code/community/Meanbee/Shippingrules/Helper/Config.php
@@ -5,7 +5,7 @@ class Meanbee_Shippingrules_Helper_Config extends Mage_Core_Helper_Abstract {
     const XML_CONDENSE_COUNTRIES_ON_GRID = 'carriers/meanship/condense_countries_on_grid';
     const XML_CLIP_POINT_ON_GRID = 'carriers/meanship/clip_conditions_on_grid';
     const XML_COLLAPSE_SUBCONDITION_ON_GRID = 'carriers/meanship/collapse_conditions_on_subcondition_on_grid';
-    const XML_USE_EMOJI_ONE = 'carriers/meanship/use_emoji_one';
+    const XML_USE_EMOJI_ONE = 'carriers/meanship/use_emojione';
     const XML_OPERATOR_RENDER_TYPE_ON_GRID = 'carriers/meanship/operator_render_type_on_grid';
 
     /**

diff --git a/app/code/community/Meanbee/Shippingrules/Helper/Emoji.php b/app/code/community/Meanbee/Shippingrules/Helper/Emoji.php
@@ -4,7 +4,12 @@ class Meanbee_Shippingrules_Helper_Emoji extends Mage_Core_Helper_Abstract {
 
 	public function __construct()
 	{
-		$this->_libraryClient = new Emojione_Client();
+		$this->_libraryClient = new Emojione_Client(
+		    null,
+            Mage::getDesign()->getSkinBaseUrl() . 'lib/emojione/png/',
+            Mage::getDesign()->getSkinBaseUrl() . 'lib/emojione/svg/',
+            Mage::getDesign()->getSkinUrl('lib/emojione/sprites/emojione.sprites.svg')
+        );
 	}
 
 	/**

diff --git a/app/code/community/Meanbee/Shippingrules/etc/config.xml b/app/code/community/Meanbee/Shippingrules/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Meanbee_Shippingrules>
-            <version>2.7.3</version>
+            <version>2.7.4</version>
         </Meanbee_Shippingrules>
     </modules>
     <global>

diff --git a/lib/Emojione/Client.php b/lib/Emojione/Client.php
@@ -21,12 +21,13 @@ class Emojione_Client implements Emojione_ClientInterface
 
     protected $ruleset = null;
 
-    public function __construct(Emojione_RulesetInterface $ruleset = null)
+    public function __construct(Emojione_RulesetInterface $ruleset = null, $imagePathPNG,
+        $imagePathSVG, $imagePathSVGSprites)
     {
-        if ( ! is_null($ruleset) )
-        {
-            $this->ruleset = $ruleset;
-        }
+        $this->ruleset = $ruleset;
+        $this->imagePathPNG = $imagePathPNG;
+        $this->imagePathSVG = $imagePathSVG;
+        $this->imagePathSVGSprites = $imagePathSVGSprites;
     }
 
     // ##########################################

diff --git a/modman b/modman
@@ -3,6 +3,7 @@ app/etc/modules/*                                           app/etc/modules/
 app/design/adminhtml/default/default/layout/meanbee/*       app/design/adminhtml/default/default/layout/meanbee/
 app/design/adminhtml/default/default/template/meanbee/*     app/design/adminhtml/default/default/template/meanbee/
 js/meanbee/shippingrules/*                                  js/meanbee/shippingrules/
+lib/Emojione                                                lib/Emojione
 skin/adminhtml/base/default/meanbee/shippingrules/*         skin/adminhtml/base/default/meanbee/shippingrules/
 skin/adminhtml/default/default/lib/emojione/*               skin/adminhtml/default/default/lib/emojione/
 Meanbee_Shippingrules.xml                                   var/connect/