Skip to content

A
angular-emoji-popup
Commit 6a8d7ef5 authored by Madhur's avatar Madhur
Browse files
Options

more refactoring

parent 11629463
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 41 deletions
.gitignore
View file @ 6a8d7ef5
...@@ -4,4 +4,5 @@ _site/ ...@@ -4,4 +4,5 @@ _site/
node_modules node_modules
build build
dist dist
jshint.log jshint.log
\ No newline at end of file src
\ No newline at end of file
Gruntfile.js
View file @ 6a8d7ef5
...@@ -20,7 +20,7 @@ module.exports = function(grunt) ...@@ -20,7 +20,7 @@ module.exports = function(grunt)
}, },
files: files:
{ {
src: ['dist/js/*.js', 'dist/css/*.css'] src: ['dist/js/*.js', 'dist/css/*.css', 'src/css/*.css', 'src/js/*.js']
} }
} }
}, },
...@@ -49,6 +49,26 @@ module.exports = function(grunt) ...@@ -49,6 +49,26 @@ module.exports = function(grunt)
src: 'img/*', src: 'img/*',
dest: 'dist/', dest: 'dist/',
}, },
src:
{
files: [
{
src: 'img/*',
dest: 'src/'
},
{
src: 'css/*.css',
dest: 'src/'
},
{
src: 'js/*.js',
dest: 'src/'
},
]
},
}, },
uglify: uglify:
...@@ -93,11 +113,10 @@ module.exports = function(grunt) ...@@ -93,11 +113,10 @@ module.exports = function(grunt)
archive: 'emoji.zip' archive: 'emoji.zip'
}, },
files: [ files: [
{ {
src: ['dist/**'], src: ['dist/**'],
dest: '/', dest: '/',
} }]
]
} }
} }
}); });
...@@ -114,7 +133,9 @@ module.exports = function(grunt) ...@@ -114,7 +133,9 @@ module.exports = function(grunt)
// Default task(s). // Default task(s).
grunt.registerTask('default', ['uglify', 'jshint', 'cssmin', 'usebanner', 'copy', 'compress']); grunt.registerTask('default', ['uglify', 'jshint', 'cssmin', 'usebanner', 'copy:main', 'compress']);
grunt.registerTask('src', ['copy:src', 'usebanner']);
grunt.registerTask('serve', ['connect', 'watch']); grunt.registerTask('serve', ['connect', 'watch']);
}; };
index.html
View file @ 6a8d7ef5
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>AngularJs Emoji Popup Demo</title> <title>AngularJs Emoji Popup Demo</title>
<link type="text/stylesheet" rel="stylesheet" href="css/bootstrap.min.css" /> <link type="text/stylesheet" rel="stylesheet" href="css/lib/bootstrap.min.css" />
<link type="text/stylesheet" rel="stylesheet" href="css/bootstrap-theme.min.css" /> <link type="text/stylesheet" rel="stylesheet" href="css/lib/bootstrap-theme.min.css" />
<link type="text/stylesheet" rel="stylesheet" href="css/nanoscroller.css" /> <link type="text/stylesheet" rel="stylesheet" href="css/nanoscroller.css" />
<link type="text/stylesheet" rel="stylesheet" href="css/emoji.css" /> <link type="text/stylesheet" rel="stylesheet" href="css/emoji.css" />
<link type="text/stylesheet" rel="stylesheet" href="css/style.css" /> <link type="text/stylesheet" rel="stylesheet" href="css/style.css" />
...@@ -130,13 +130,24 @@ ...@@ -130,13 +130,24 @@
<script type="text/javascript" src="js/config.js"></script> <script type="text/javascript" src="js/config.js"></script>
<script type="text/javascript" src="js/util.js"></script> <script type="text/javascript" src="js/util.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/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/emojiFilters.js"></script> <script type="text/javascript" src="js/emojiFilters.js"></script>
<script type="text/javascript" src="js/nanoscroller.js"></script> <script type="text/javascript" src="js/nanoscroller.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="build/emoji.min.js"></script>--> <script type="text/javascript" src="build/emoji.min.js"></script>-->
<script type="text/javascript" src="js/emojiController.js"></script>
<script type="text/javascript">
emojiApp.controller('emojiController', ['$scope', function($scope) {
$scope.emojiMessage={};
$scope.decodeType='colon';
$scope.emojiMessage.replyToUser = function()
{
alert('You typed ' + $scope.emojiMessage.messagetext);
}
}]);
</script>
</body> </body>
......
js/emojiController.js deleted 100644 → 0
View file @ 11629463
'use strict';
emojiApp.controller('emojiController', ['$scope', '$log', function($scope, $log) {
$scope.emojiMessage={};
$scope.decodeType='colon';
$scope.emojiMessage.replyToUser = function()
{
alert('You typed ' + $scope.emojiMessage.messagetext);
}
}]);
js/emojiDirectives.js
View file @ 6a8d7ef5
...@@ -257,3 +257,38 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile', ...@@ -257,3 +257,38 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile',
}); });
} }
}]); }]);
emojiApp.directive('contenteditable', [ '$sce', function($sce) {
return {
restrict : 'A', // only activate on element attribute
require : '?ngModel', // get a hold of NgModelController
link : function(scope, element, attrs, ngModel) {
if (!ngModel)
return; // do nothing if no ng-model
// Specify how UI should be updated
ngModel.$render = function() {
element.html(ngModel.$viewValue || '');
};
// Listen for change events to enable binding
element.on('blur keyup change', function() {
scope.$evalAsync(read);
});
read(); // initialize
// Write data to the model
function read() {
var html = element.html();
// When we clear the content editable the browser leaves a <br>
// behind
// If strip-br attribute is provided then we strip this out
if (attrs.stripBr && html == '<br>') {
html = '';
}
ngModel.$setViewValue(html);
}
}
};
} ]);
js/util.js
View file @ 6a8d7ef5
'use strict'; 'use strict';
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) { function cancelEvent (event) {
event = event || window.event; event = event || window.event;
if (event) { if (event) {
......
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