From 8456a3cf6fcd2588c68ef39ad04b6c0a233d3f5d Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 10 Sep 2018 18:09:23 +0200 Subject: Moved emojis to assets --- includes/sys_template.php | 2 +- public/emojis/cry.gif | Bin 498 -> 0 bytes public/emojis/evil.gif | Bin 236 -> 0 bytes public/emojis/lol.gif | Bin 336 -> 0 bytes public/emojis/mad.gif | Bin 174 -> 0 bytes public/emojis/question.gif | Bin 248 -> 0 bytes public/emojis/redface.gif | Bin 650 -> 0 bytes public/emojis/rolleyes.gif | Bin 485 -> 0 bytes public/emojis/sad.gif | Bin 171 -> 0 bytes public/emojis/smile.gif | Bin 174 -> 0 bytes public/emojis/wind.gif | Bin 170 -> 0 bytes resources/assets/emojis/cry.gif | Bin 0 -> 498 bytes resources/assets/emojis/evil.gif | Bin 0 -> 236 bytes resources/assets/emojis/lol.gif | Bin 0 -> 336 bytes resources/assets/emojis/mad.gif | Bin 0 -> 174 bytes resources/assets/emojis/question.gif | Bin 0 -> 248 bytes resources/assets/emojis/redface.gif | Bin 0 -> 650 bytes resources/assets/emojis/rolleyes.gif | Bin 0 -> 485 bytes resources/assets/emojis/sad.gif | Bin 0 -> 171 bytes resources/assets/emojis/smile.gif | Bin 0 -> 174 bytes resources/assets/emojis/wind.gif | Bin 0 -> 170 bytes src/Http/Response.php | 2 +- webpack.config.js | 7 +++++++ 23 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 public/emojis/cry.gif delete mode 100644 public/emojis/evil.gif delete mode 100644 public/emojis/lol.gif delete mode 100644 public/emojis/mad.gif delete mode 100644 public/emojis/question.gif delete mode 100644 public/emojis/redface.gif delete mode 100644 public/emojis/rolleyes.gif delete mode 100644 public/emojis/sad.gif delete mode 100644 public/emojis/smile.gif delete mode 100644 public/emojis/wind.gif create mode 100644 resources/assets/emojis/cry.gif create mode 100644 resources/assets/emojis/evil.gif create mode 100644 resources/assets/emojis/lol.gif create mode 100644 resources/assets/emojis/mad.gif create mode 100644 resources/assets/emojis/question.gif create mode 100644 resources/assets/emojis/redface.gif create mode 100644 resources/assets/emojis/rolleyes.gif create mode 100644 resources/assets/emojis/sad.gif create mode 100644 resources/assets/emojis/smile.gif create mode 100644 resources/assets/emojis/wind.gif diff --git a/includes/sys_template.php b/includes/sys_template.php index 19b0c2fa..e764c6e3 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -482,7 +482,7 @@ function ReplaceSmilies($msg) ) { $msg = str_ireplace($search, sprintf( '', - sprintf($assets->getAsset('emojis/%s.gif'), $replace) + sprintf($assets->getAsset('assets/emojis/%s.gif'), $replace) ), $msg); } diff --git a/public/emojis/cry.gif b/public/emojis/cry.gif deleted file mode 100644 index 7d54b1f9..00000000 Binary files a/public/emojis/cry.gif and /dev/null differ diff --git a/public/emojis/evil.gif b/public/emojis/evil.gif deleted file mode 100644 index ab1aa8e1..00000000 Binary files a/public/emojis/evil.gif and /dev/null differ diff --git a/public/emojis/lol.gif b/public/emojis/lol.gif deleted file mode 100644 index 374ba150..00000000 Binary files a/public/emojis/lol.gif and /dev/null differ diff --git a/public/emojis/mad.gif b/public/emojis/mad.gif deleted file mode 100644 index 1f6c3c2f..00000000 Binary files a/public/emojis/mad.gif and /dev/null differ diff --git a/public/emojis/question.gif b/public/emojis/question.gif deleted file mode 100644 index 9d072265..00000000 Binary files a/public/emojis/question.gif and /dev/null differ diff --git a/public/emojis/redface.gif b/public/emojis/redface.gif deleted file mode 100644 index ad762832..00000000 Binary files a/public/emojis/redface.gif and /dev/null differ diff --git a/public/emojis/rolleyes.gif b/public/emojis/rolleyes.gif deleted file mode 100644 index d7f5f2f4..00000000 Binary files a/public/emojis/rolleyes.gif and /dev/null differ diff --git a/public/emojis/sad.gif b/public/emojis/sad.gif deleted file mode 100644 index d2ac78c0..00000000 Binary files a/public/emojis/sad.gif and /dev/null differ diff --git a/public/emojis/smile.gif b/public/emojis/smile.gif deleted file mode 100644 index 7b1f6d30..00000000 Binary files a/public/emojis/smile.gif and /dev/null differ diff --git a/public/emojis/wind.gif b/public/emojis/wind.gif deleted file mode 100644 index d1482880..00000000 Binary files a/public/emojis/wind.gif and /dev/null differ diff --git a/resources/assets/emojis/cry.gif b/resources/assets/emojis/cry.gif new file mode 100644 index 00000000..7d54b1f9 Binary files /dev/null and b/resources/assets/emojis/cry.gif differ diff --git a/resources/assets/emojis/evil.gif b/resources/assets/emojis/evil.gif new file mode 100644 index 00000000..ab1aa8e1 Binary files /dev/null and b/resources/assets/emojis/evil.gif differ diff --git a/resources/assets/emojis/lol.gif b/resources/assets/emojis/lol.gif new file mode 100644 index 00000000..374ba150 Binary files /dev/null and b/resources/assets/emojis/lol.gif differ diff --git a/resources/assets/emojis/mad.gif b/resources/assets/emojis/mad.gif new file mode 100644 index 00000000..1f6c3c2f Binary files /dev/null and b/resources/assets/emojis/mad.gif differ diff --git a/resources/assets/emojis/question.gif b/resources/assets/emojis/question.gif new file mode 100644 index 00000000..9d072265 Binary files /dev/null and b/resources/assets/emojis/question.gif differ diff --git a/resources/assets/emojis/redface.gif b/resources/assets/emojis/redface.gif new file mode 100644 index 00000000..ad762832 Binary files /dev/null and b/resources/assets/emojis/redface.gif differ diff --git a/resources/assets/emojis/rolleyes.gif b/resources/assets/emojis/rolleyes.gif new file mode 100644 index 00000000..d7f5f2f4 Binary files /dev/null and b/resources/assets/emojis/rolleyes.gif differ diff --git a/resources/assets/emojis/sad.gif b/resources/assets/emojis/sad.gif new file mode 100644 index 00000000..d2ac78c0 Binary files /dev/null and b/resources/assets/emojis/sad.gif differ diff --git a/resources/assets/emojis/smile.gif b/resources/assets/emojis/smile.gif new file mode 100644 index 00000000..7b1f6d30 Binary files /dev/null and b/resources/assets/emojis/smile.gif differ diff --git a/resources/assets/emojis/wind.gif b/resources/assets/emojis/wind.gif new file mode 100644 index 00000000..d1482880 Binary files /dev/null and b/resources/assets/emojis/wind.gif differ diff --git a/src/Http/Response.php b/src/Http/Response.php index d79ab98b..4edf644a 100644 --- a/src/Http/Response.php +++ b/src/Http/Response.php @@ -22,7 +22,7 @@ class Response extends SymfonyResponse implements ResponseInterface public function __construct( $content = '', int $status = 200, - array $headers = array(), + array $headers = [], Renderer $view = null ) { $this->view = $view; diff --git a/webpack.config.js b/webpack.config.js index 261c1c44..fd36b0f9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -23,6 +23,11 @@ for (let i = 0; i < 7; i++) { themeEntries[`theme${i}`] = `./resources/assets/themes/theme${i}.less`; } +const emojis = {}; +for (let emoji of ['redface', 'wind', 'smile', 'sad', 'lol', 'cry', 'rolleyes', 'evil', 'mad', 'question']){ + emojis[`${emoji}`] = `./resources/assets/emojis/${emoji}.gif`; +} + module.exports = { context: __dirname, resolve: { @@ -31,6 +36,7 @@ module.exports = { entry: { ...themeEntries, vendor: './resources/assets/js/vendor.js', + ...emojis, }, output: { path: path.resolve('public/assets'), @@ -46,6 +52,7 @@ module.exports = { query: { cacheDirectory: true }, }, { test: /\.(eot|ttf|otf|svg|woff2?)(\?.*)?$/, loader: 'file-loader' }, + { test: /\.gif$/, loader: 'file-loader?name=emojis/[name].[ext]' }, { test: /\.json$/, loader: 'json-loader' }, { test: /\.css$/, loader: 'style-loader!css-loader' }, { test: /\.less$/, use: ExtractTextPlugin.extract({ -- cgit v1.2.3-54-g00ecf