Commit 753863e3 authored by ricardo-teixeira's avatar ricardo-teixeira

Fix sprite path

parent 9d13a20c
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -29,7 +29,7 @@ emojiApp.config(['$sceProvider', function($sceProvider) ...@@ -29,7 +29,7 @@ emojiApp.config(['$sceProvider', function($sceProvider)
} }
} }
$.emojiarea.spritesheetPath = '../assets/angular-emoji-popup/dist/img/emojisprite_!.png'; $.emojiarea.spritesheetPath = '../assets/angular-chat-emoji-popup/dist/img/emojisprite_!.png';
$.emojiarea.spritesheetDimens = Config.EmojiCategorySpritesheetDimens; $.emojiarea.spritesheetDimens = Config.EmojiCategorySpritesheetDimens;
$.emojiarea.iconSize = 20; $.emojiarea.iconSize = 20;
$.emojiarea.icons = icons; $.emojiarea.icons = icons;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
var TAGS_BLOCK = [ 'p', 'div', 'pre', 'form' ]; var TAGS_BLOCK = [ 'p', 'div', 'pre', 'form' ];
var KEY_ESC = 27; var KEY_ESC = 27;
var KEY_TAB = 9; var KEY_TAB = 9;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/* /*
...@@ -276,17 +276,17 @@ ...@@ -276,17 +276,17 @@
+ xoffset + 'px ' + yoffset + 'px no-repeat;'; + xoffset + 'px ' + yoffset + 'px no-repeat;';
style += 'background-size:' + scaledWidth + 'px ' + scaledHeight style += 'background-size:' + scaledWidth + 'px ' + scaledHeight
+ 'px;'; + 'px;';
return '<img src="../assets/angular-emoji-popup/dist/img/blank.gif" class="img" style="' return '<img src="../assets/angular-chat-emoji-popup/dist/img/blank.gif" class="img" style="'
+ style + '" alt="' + util.htmlEntities(name) + '">'; + style + '" alt="' + util.htmlEntities(name) + '">';
}; };
$.emojiarea.createIcon = EmojiArea.createIcon; $.emojiarea.createIcon = EmojiArea.createIcon;
/* ! MODIFICATION END */ /* ! MODIFICATION END */
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/** /**
* Editor (plain-text) * Editor (plain-text)
* *
* @constructor * @constructor
* @param {object} * @param {object}
* $textarea * $textarea
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
/** /**
* Editor (rich) * Editor (rich)
* *
* @constructor * @constructor
* @param {object} * @param {object}
* $textarea * $textarea
...@@ -536,7 +536,7 @@ ...@@ -536,7 +536,7 @@
/** /**
* Emoji Dropdown Menu * Emoji Dropdown Menu
* *
* @constructor * @constructor
* @param {object} * @param {object}
* emojiarea * emojiarea
...@@ -581,12 +581,12 @@ ...@@ -581,12 +581,12 @@
* ! MODIFICATION: Following 3 lines were added by Igor Zhukov, in order * ! MODIFICATION: Following 3 lines were added by Igor Zhukov, in order
* to add scrollbars to EmojiMenu * to add scrollbars to EmojiMenu
*/ */
if (!Config.Mobile) { if (!Config.Mobile) {
this.$itemsWrap.nanoScroller({preventPageScrolling: true, tabIndex: this.$itemsWrap.nanoScroller({preventPageScrolling: true, tabIndex:
-1}); } -1}); }
//this.$itemsWrap.nanoScroller({preventPageScrolling: true, tabIndex:* -1}); //this.$itemsWrap.nanoScroller({preventPageScrolling: true, tabIndex:* -1});
$body.on('keydown', function(e) { $body.on('keydown', function(e) {
...@@ -687,12 +687,12 @@ ...@@ -687,12 +687,12 @@
this.currentCategory = category; this.currentCategory = category;
this.load(category); this.load(category);
if (!Config.Mobile) { this.$itemsWrap.nanoScroller({ scroll: 'top' if (!Config.Mobile) { this.$itemsWrap.nanoScroller({ scroll: 'top'
}); } }); }
}; };
/* ! MODIFICATION END */ /* ! MODIFICATION END */
...@@ -722,10 +722,10 @@ ...@@ -722,10 +722,10 @@
var updateItems = function() { var updateItems = function() {
self.$items.html(html.join('')); self.$items.html(html.join(''));
if (!Config.Mobile) { setTimeout(function () { if (!Config.Mobile) { setTimeout(function () {
self.$itemsWrap.nanoScroller(); }, 100); } self.$itemsWrap.nanoScroller(); }, 100); }
} }
if (category > 0) { if (category > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment