diff --git a/Gruntfile.js b/Gruntfile.js
index 59c842222..02c92ed4a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -109,6 +109,26 @@ module.exports = function(grunt) {
],
options: { jshintrc: '.jshintrc' },
},
+ dist: {
+ src: [
+ 'manifest.json',
+ 'background.html',
+ 'index.html',
+ 'converesation.html',
+ 'options.html',
+ 'protos/*',
+ 'js/**',
+ 'stylesheets/*.css',
+ 'images/**',
+ 'fonts/*',
+ '!js/register.js'
+ ]
+ },
+ copy: {
+ dist: {
+ files: [{ expand: true, dest: 'dist/', src: ['<%= dist.src %>'] }]
+ }
+ },
jscs: {
all: {
src: ['js/**/*.js', '!js/libtextsecure.js', '!js/components.js', 'test/**/*.js']
@@ -130,7 +150,11 @@ module.exports = function(grunt) {
libaxolotl: {
files: ['./libaxolotl/*.js'],
tasks: ['concat:libaxolotl']
- }
+ },
+ dist: {
+ files: ['<%= dist.src %>'],
+ tasks: ['copy']
+ },
},
connect: {
server: {
@@ -155,7 +179,7 @@ module.exports = function(grunt) {
testname: 'TextSecure-Browser Tests'
}
}
- }
+ },
});
Object.keys(grunt.config.get('pkg').devDependencies).forEach(function(key) {
diff --git a/images/twemoji/16x16 b/images/twemoji/16x16
new file mode 120000
index 000000000..f64262c80
--- /dev/null
+++ b/images/twemoji/16x16
@@ -0,0 +1 @@
+../../components/twemoji/16x16
\ No newline at end of file
diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
index 3b6921e59..b6de26bc4 100644
--- a/js/views/conversation_list_item_view.js
+++ b/js/views/conversation_list_item_view.js
@@ -49,7 +49,7 @@
})
);
- twemoji.parse(this.el, { base: '/components/twemoji/', size: 16 });
+ twemoji.parse(this.el, { base: '/images/twemoji/', size: 16 });
var unread = this.model.get('unreadCount');
if (unread > 0) {
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 7a8a073ad..49e58f791 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -44,7 +44,7 @@
})
);
- twemoji.parse(this.el, { base: '/components/twemoji/', size: 16 });
+ twemoji.parse(this.el, { base: '/images/twemoji/', size: 16 });
var content = this.$el.find('.content');
content.html(this.autoLink(content.html()));
diff --git a/options.html b/options.html
index 6f5090156..e81f82e4e 100644
--- a/options.html
+++ b/options.html
@@ -18,7 +18,7 @@
TextSecure Options
-
+
diff --git a/package.json b/package.json
index 0c6e2b80d..08a95af66 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,13 @@
"grunt-cli": "^0.1.13",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-connect": "^0.9.0",
+ "grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-watch": "^0.6.1",
+ "grunt-jscs": "^1.1.0",
"grunt-preen": "^1.0.0",
- "grunt-saucelabs": "^8.3.3",
- "grunt-jscs": "^1.1.0"
+ "grunt-saucelabs": "^8.3.3"
},
"scripts": {
"test": "grunt test",
diff --git a/stylesheets/bootstrap.css b/stylesheets/bootstrap.css
new file mode 120000
index 000000000..a60188ff5
--- /dev/null
+++ b/stylesheets/bootstrap.css
@@ -0,0 +1 @@
+../components/bootstrap/dist/css/bootstrap.css
\ No newline at end of file
diff --git a/test/views/message_view_test.js b/test/views/message_view_test.js
index 3771e05ab..9a105986e 100644
--- a/test/views/message_view_test.js
+++ b/test/views/message_view_test.js
@@ -71,7 +71,7 @@ describe('MessageView', function() {
view.render();
var img = view.$el.find('.content img');
assert.strictEqual(img.length, 1);
- assert.strictEqual(img.attr('src'), '/components/twemoji/16x16/2764.png');
+ assert.strictEqual(img.attr('src'), '/images/twemoji/16x16/2764.png');
assert.strictEqual(img.attr('alt'), '\u2764\uFE0F');
assert.strictEqual(img.attr('class'), 'emoji');
});