Commit 02ef4f8c authored by Madhur's avatar Madhur

more grunt modules

parent 8143e26d
...@@ -15,7 +15,7 @@ module.exports = function(grunt) ...@@ -15,7 +15,7 @@ module.exports = function(grunt)
{ {
files: files:
{ {
'build/emoji.min.js': ['js/app.js', 'js/config.js', 'js/emojiDirectives.js', 'js/emojiFilters.js', 'js/util.js', 'js/jquery.emojiarea.js', 'js/nanoscroller.js'] 'dist/emoji.min.js': ['js/app.js', 'js/emojiDirectives.js', 'js/emojiFilters.js', 'js/util.js', 'js/jquery.emojiarea.js', 'js/nanoscroller.js']
} }
} }
}, },
...@@ -41,7 +41,7 @@ module.exports = function(grunt) ...@@ -41,7 +41,7 @@ module.exports = function(grunt)
}, },
files: files:
{ {
'build/emoji.min.css': ['css/style.css'] 'dist/emoji.min.css': ['css/nanoscroller.css','css/style.css']
} }
} }
} }
...@@ -51,6 +51,9 @@ module.exports = function(grunt) ...@@ -51,6 +51,9 @@ module.exports = function(grunt)
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-banner');
// Default task(s). // Default task(s).
grunt.registerTask('default', ['uglify', 'jshint', 'cssmin']); grunt.registerTask('default', ['uglify', 'jshint', 'cssmin']);
......
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
<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="build/emoji.min.js"></script>-->
<script type="text/javascript" src="js/emojiController.js"></script>
</body> </body>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
var emojiApp = angular.module("emojiApp", ['ngSanitize']); var emojiApp = angular.module("emojiApp", ['ngSanitize']);
emojiApp.config(function($sceProvider) emojiApp.config(['$sceProvider', function($sceProvider)
{ {
$sceProvider.enabled(false); $sceProvider.enabled(false);
...@@ -33,7 +33,7 @@ emojiApp.config(function($sceProvider) ...@@ -33,7 +33,7 @@ emojiApp.config(function($sceProvider)
$.emojiarea.icons = icons; $.emojiarea.icons = icons;
$.emojiarea.reverseIcons = reverseIcons; $.emojiarea.reverseIcons = reverseIcons;
}); }]);
emojiApp.directive('contenteditable', [ '$sce', function($sce) { emojiApp.directive('contenteditable', [ '$sce', function($sce) {
return { return {
......
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