Adding a common class to sprite elements

PR from @webfella
joypixels · Mar 8, 2016 · 1d49ab8 · 1d49ab8
1 parent 875213a
commit 1d49ab8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/assets/sprites/emojione.sprites.css b/assets/sprites/emojione.sprites.css
@@ -1,4 +1,4 @@
-[class*=emojione-] {
+.emojione {
   text-indent: -9999em;
   image-rendering: optimizeQuality;
   font-size: inherit;

diff --git a/assets/sprites/emojione.sprites.mustache b/assets/sprites/emojione.sprites.mustache
@@ -3,7 +3,7 @@
   'functions': true
 }
 
-[class*=emojione-] {
+.emojione {
   text-indent:-9999em;
   image-rendering: optimizeQuality;
   font-size: inherit;
@@ -24,4 +24,4 @@
 .{{name}} {
   background-position: (({{px.x}} * 100 / ({{px.total_width}} * (40/41))))#{"%"} (({{px.y}} * 100 / ({{px.total_height}} * (39/40))))#{"%"};
 }
-{{/items}}
+{{/items}}
diff --git a/assets/sprites/emojione.sprites.scss b/assets/sprites/emojione.sprites.scss
@@ -1,4 +1,4 @@
-[class*=emojione-] {
+.emojione {
   text-indent:-9999em;
   image-rendering: optimizeQuality;
   font-size: inherit;

diff --git a/demos/sprites-png.html b/demos/sprites-png.html
@@ -128,9 +128,9 @@ <h3>2. Enable PNG Sprite mode</h3>
 $client->imageType = 'png';
 $client->sprites = true;</pre>
 
-      <p>If you are not using our conversion scripts, PNG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <span class="emojione-1f433">&#x1f433;</span></p>
+      <p>If you are not using our conversion scripts, PNG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <span class="emojione emojione-1f433">&#x1f433;</span></p>
       <pre class="brush: php">
-&lt;span class="emojione-1f433"&gt;
+&lt;span class="emojione emojione-1f433"&gt;
   &amp;#x1f433;
 &lt;/span&gt;</pre>
 

diff --git a/lib/js/emojione.js b/lib/js/emojione.js
diff --git a/lib/php/src/Client.php b/lib/php/src/Client.php
@@ -245,7 +245,7 @@ public function shortnameToImageCallback($m)
             {
                 if ($this->sprites)
                 {
-                    return '<span class="emojione-'.$unicode.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
+                    return '<span class="emojione emojione-'.$unicode.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else
                 {
@@ -317,7 +317,7 @@ public function asciiToImageCallback($m)
             {
                 if ($this->sprites)
                 {
-                    return $m[2].'<span class="emojione-'.$unicode.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
+                    return $m[2].'<span class="emojione emojione-'.$unicode.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else
                 {
@@ -421,7 +421,7 @@ public function unicodeToImageCallback($m)
             {
                 if ($this->sprites)
                 {
-                    return '<span class="emojione-'.$filename.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
+                    return '<span class="emojione emojione-'.$filename.'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else
                 {

diff --git a/lib/php/test/SpriteTest.php b/lib/php/test/SpriteTest.php
@@ -36,7 +36,7 @@ protected function tearDown()
     public function testToImage()
     {
         $test     = 'Hello world! 😄 :smile:';
-        $expected = 'Hello world! <span class="emojione-1f604" title=":smile:">😄</span> <span class="emojione-1f604" title=":smile:">&#x1f604;</span>';
+        $expected = 'Hello world! <span class="emojione emojione-1f604" title=":smile:">😄</span> <span class="emojione emojione-1f604" title=":smile:">&#x1f604;</span>';
 
         $this->assertEquals(Emojione::toImage($test), $expected);
     }
@@ -49,7 +49,7 @@ public function testToImage()
     public function testShortnameToImage()
     {
         $test     = 'Hello world! 😄 :smile:';
-        $expected = 'Hello world! 😄 <span class="emojione-1f604" title=":smile:">&#x1f604;</span>';
+        $expected = 'Hello world! 😄 <span class="emojione emojione-1f604" title=":smile:">&#x1f604;</span>';
 
         $this->assertEquals(Emojione::shortnameToImage($test), $expected);
     }
@@ -62,7 +62,7 @@ public function testShortnameToImage()
     public function testUnicodeToImage()
     {
         $test     = 'Hello world! 😄 :smile:';
-        $expected = 'Hello world! <span class="emojione-1f604" title=":smile:">😄</span> :smile:';
+        $expected = 'Hello world! <span class="emojione emojione-1f604" title=":smile:">😄</span> :smile:';
 
         $this->assertEquals(Emojione::unicodeToImage($test), $expected);
     }

diff --git a/lib/python/emojipy/emojipy.py b/lib/python/emojipy/emojipy.py
@@ -59,7 +59,7 @@ def replace_unicode(match):
 
             if cls.image_type == 'png':
                 if cls.sprites:
-                    return '<span class="emojione-%s" title="%s">%s</span>'\
+                    return '<span class="emojione emojione-%s" title="%s">%s</span>'\
                         % (filename, escape(shortcode), alt)
                 else:
                     return '<img class="emojione" alt="%s" src="%s"/>' % (
@@ -93,7 +93,7 @@ def replace_shortcode(match):
             filename = shortcode_replace[shortcode].upper()
             if cls.image_type == 'png':
                 if cls.sprites:
-                    return '<span class="emojione-%s" title="%s">%s</span>'\
+                    return '<span class="emojione emojione-%s" title="%s">%s</span>'\
                         % (filename, escape(shortcode), alt)
                 else:
                     return '<img class="emojione" alt="%s" src="%s"/>' % (
@@ -168,7 +168,7 @@ def replace_ascii(match):
                 alt = escape(ascii)
             if cls.image_type == 'png':
                 if cls.sprites:
-                    return '<span class="emojione-%s" title="%s">%s</span>'\
+                    return '<span class="emojione emojione-%s" title="%s">%s</span>'\
                         % (unicode, escape(ascii), alt)
                 else:
                     return '<img class="emojione" alt="%s" src="%s"/>' % (

diff --git a/lib/python/emojipy/tests/test_sprite.py b/lib/python/emojipy/tests/test_sprite.py
@@ -18,6 +18,6 @@ def test_unicode_to_image(self):
         """
 
         text = 'Hello world! 😄 :smile:'
-        expected = 'Hello world! <span class="emojione-1F604" title=":smile:">😄</span> :smile:'
+        expected = 'Hello world! <span class="emojione emojione-1F604" title=":smile:">😄</span> :smile:'
 
         self.assertEqual(self.emoji.unicode_to_image(text), expected)