diff --git a/.bowerrc b/.bowerrc index 6767938..7a16f47 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,4 +1,4 @@ { "analytics": false, - "directory": "components" + "directory": "vendor" } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9567c13..07c1a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ node_modules # Do not index bower components -components +vendor # Do not index releases release diff --git a/Plugin.php b/Plugin.php index 19a3c71..035c7fd 100644 --- a/Plugin.php +++ b/Plugin.php @@ -85,8 +85,8 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi { if ($this->isAppropriatePage($args['request'])) { $base_path = $this->getFilesPath(); - $args['js'][] = $base_path . '/components/es5-shim/es5-shim.js'; - $args['js'][] = $base_path . '/components/emojify.js/emojify.js'; + $args['js'][] = $base_path . '/vendor/es5-shim/es5-shim.js'; + $args['js'][] = $base_path . '/vendor/emojify.js/emojify.js'; $args['js'][] = $base_path . '/js/plugin.js'; } } @@ -115,7 +115,7 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi if ($this->isAppropriatePage($request)) { $args['plugins']['MibewEmoji'] = array( 'imagesDir' => ($request->getBasePath() . '/' . $this->getFilesPath() - . '/components/emojify.js/images/emoji'), + . '/vendor/emojify.js/images/emoji'), 'ignoreEmoticons' => $this->config['ignore_emoticons'], ); } diff --git a/gulpfile.js b/gulpfile.js index 7c6d037..fbea81e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -49,12 +49,12 @@ var getSources = function() { 'LICENSE', 'js/*', 'css/*', - 'components/es5-shim/es5-shim.js', - 'components/es5-shim/LICENSE', - 'components/es5-shim/README.md', - 'components/emojify.js/emojify.js', - 'components/emojify.js/README.md', - 'components/emojify.js/images/emoji/*' + 'vendor/es5-shim/es5-shim.js', + 'vendor/es5-shim/LICENSE', + 'vendor/es5-shim/README.md', + 'vendor/emojify.js/emojify.js', + 'vendor/emojify.js/README.md', + 'vendor/emojify.js/images/emoji/*' ], {base: './'} )