Commit abfad1ff authored by Madhur's avatar Madhur

smiley appearing

parent 32abc202
.form-control
{
width: 500px;
}
.form-control:focus { .form-control:focus {
border-color: #66afe9; border-color: #66afe9;
outline: 0; outline: 0;
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
</head> </head>
<body ng-controller="emojiController"> <body ng-controller="emojiController">
<!--<h1>Angular Emoji Popup</h1>--> <!--<h1>Angular Emoji Popup</h1>-->
<p/> <p/>
<p/> <p/>
<p/> <p/>
<p/> <p/>
<div my-form class="myform"> <div my-form class="myform">
<textarea id="messageInput" ng-enter="replyToUser()" ng-model="messagetext" placeholder="Write a message..." class="ng-untouched ng-valid ng-dirty ng-valid-parse" style="display: none;"></textarea> <textarea id="messageInput" ng-enter="replyToUser()" ng-model="messagetext" placeholder="Write a message..." class="ng-untouched ng-valid ng-dirty ng-valid-parse" style="display: none;"></textarea>
...@@ -21,18 +21,32 @@ ...@@ -21,18 +21,32 @@
<div style="margin-right:10px;margin-top:5px;" class="im_emoji_btn" id="emojibtn" style="cursor:pointer"> <div style="margin-right:10px;margin-top:5px;" class="im_emoji_btn" id="emojibtn" style="cursor:pointer">
<i class="icon icon-emoji" style="cursor:pointer; margin-left:20px;margin-top:10px;"></i> <i class="icon icon-emoji" style="cursor:pointer; margin-left:20px;margin-top:10px;"></i>
</div> </div>
<br/>
<span style="float:clear"></span>
<div> String with Colons: </div>
<div>
<input class="form-control" ng-model="messagetext">
</div>
<div> String with UTF Chars: (Will not display fine in input box) </div>
<div>
<input class="form-control" ng-model="messagetext"> </div>
</div> </div>
<script type="text/javascript" src="js/angular.min.js"></script> <script type="text/javascript" src="js/angular.min.js"></script>
<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script> <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="js/emoji.js"></script> <script type="text/javascript" src="js/emoji.js"></script>
<script type="text/javascript" src="js/jquery.emojiarea.js"></script> <script type="text/javascript" src="js/jquery.emojiarea.js"></script>
<script type="text/javascript" src="js/app.js"></script> <script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/config.js"></script> <script type="text/javascript" src="js/config.js"></script>
<script type="text/javascript" src="js/emojiController.js"></script> <script type="text/javascript" src="js/emojiController.js"></script>
<script type="text/javascript" src="js/emojiDirectives.js"></script> <script type="text/javascript" src="js/emojiDirectives.js"></script>
<script type="text/javascript" src="js/nanoscroller.js"></script> <script type="text/javascript" src="js/nanoscroller.js"></script>
......
...@@ -2,19 +2,27 @@ ...@@ -2,19 +2,27 @@
var emojiApp = angular.module("emojiApp", []); var emojiApp = angular.module("emojiApp", []);
emojiApp.config(['ConfigProvider',function(ConfigProvider) { emojiApp.config(function(ConfigProvider)
{
var icons = {}, reverseIcons = {}, i, j, hex, name, dataItem, row, column, totalColumns; var Config = ConfigProvider.$get();
for (j = 0; j < Config.EmojiCategories.length; j++) { var icons = {},
reverseIcons = {},
i, j, hex, name, dataItem, row, column, totalColumns;
for (j = 0; j < Config.EmojiCategories.length; j++)
{
totalColumns = Config.EmojiCategorySpritesheetDimens[j][1]; totalColumns = Config.EmojiCategorySpritesheetDimens[j][1];
for (i = 0; i < Config.EmojiCategories[j].length; i++) { for (i = 0; i < Config.EmojiCategories[j].length; i++)
{
dataItem = Config.Emoji[Config.EmojiCategories[j][i]]; dataItem = Config.Emoji[Config.EmojiCategories[j][i]];
name = dataItem[1][0]; name = dataItem[1][0];
row = Math.floor(i / totalColumns); row = Math.floor(i / totalColumns);
column = (i % totalColumns); column = (i % totalColumns);
icons[':' + name + ':'] = [ j, row, column, icons[':' + name + ':'] = [j, row, column,
':' + name + ':' ]; ':' + name + ':'
];
reverseIcons[name] = dataItem[0]; reverseIcons[name] = dataItem[0];
} }
} }
...@@ -25,4 +33,33 @@ emojiApp.config(['ConfigProvider',function(ConfigProvider) { ...@@ -25,4 +33,33 @@ emojiApp.config(['ConfigProvider',function(ConfigProvider) {
$.emojiarea.icons = icons; $.emojiarea.icons = icons;
$.emojiarea.reverseIcons = reverseIcons; $.emojiarea.reverseIcons = reverseIcons;
}]); });
\ No newline at end of file
function checkDragEvent(e) {
if (!e || e.target && (e.target.tagName == 'IMG' || e.target.tagName == 'A')) return false;
if (e.dataTransfer && e.dataTransfer.types) {
for (var i = 0; i < e.dataTransfer.types.length; i++) {
if (e.dataTransfer.types[i] == 'Files') {
return true;
}
}
} else {
return true;
}
return false;
}
function cancelEvent (event) {
event = event || window.event;
if (event) {
event = event.originalEvent || event;
if (event.stopPropagation) event.stopPropagation();
if (event.preventDefault) event.preventDefault();
}
return false;
}
'use strict'; 'use strict';
emojiApp.provider('ConfigProvider', function()
emojiApp.provider('Config', function()
{ {
var Config = {}; var Config = {};
Config.Emoji = { Config.Emoji = {
...@@ -3479,11 +3480,6 @@ emojiApp.provider('ConfigProvider', function() ...@@ -3479,11 +3480,6 @@ emojiApp.provider('ConfigProvider', function()
}; };
}); });
//ConfigStorage //ConfigStorage
(function(window) (function(window)
{ {
...@@ -3671,4 +3667,5 @@ emojiApp.provider('ConfigProvider', function() ...@@ -3671,4 +3667,5 @@ emojiApp.provider('ConfigProvider', function()
remove: storageRemoveValue remove: storageRemoveValue
}; };
})(this); })(this);
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
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;
var Config = {};
Config.Mobile = false;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
...@@ -274,7 +276,7 @@ ...@@ -274,7 +276,7 @@
+ 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="/chat-dashboard/images/blank.gif" class="img" style="' return '<img src="/img/blank.gif" class="img" style="'
+ style + '" alt="' + util.htmlEntities(name) + '">'; + style + '" alt="' + util.htmlEntities(name) + '">';
}; };
......
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