From b482fb93c5abc25ba08ec530c556b12854538404 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 22 Oct 2015 12:25:22 +1030 Subject: [PATCH] Clean up some old code --- framework/core/js/lib/App.js | 17 ------- framework/core/scripts/compile.sh | 4 +- framework/core/stubs/extension/build.sh | 65 ------------------------- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100755 framework/core/stubs/extension/build.sh diff --git a/framework/core/js/lib/App.js b/framework/core/js/lib/App.js index d7083d9e6..caf4b667f 100644 --- a/framework/core/js/lib/App.js +++ b/framework/core/js/lib/App.js @@ -295,23 +295,6 @@ export default class App { this.modal.show(new RequestErrorModal({error})); } - /** - * Show alert error messages for each error returned in an API response. - * - * @param {Object} response - * @public - */ - alertErrors(response) { - if (response.errors) { - response.errors.forEach(error => { - this.alerts.show(new Alert({ - type: 'error', - children: error.detail - })); - }); - } - } - /** * Construct a URL to the route with the given name. * diff --git a/framework/core/scripts/compile.sh b/framework/core/scripts/compile.sh index 31f8c5c80..428a3b796 100755 --- a/framework/core/scripts/compile.sh +++ b/framework/core/scripts/compile.sh @@ -10,8 +10,8 @@ bower install cd "${base}/js/forum" npm install -gulp --production +gulp cd "${base}/js/admin" npm install -gulp --production +gulp diff --git a/framework/core/stubs/extension/build.sh b/framework/core/stubs/extension/build.sh deleted file mode 100755 index 4008b5c46..000000000 --- a/framework/core/stubs/extension/build.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -base=${PWD} - -if [ ! -f flarum.json ]; then -echo "Could not find flarum.json file!" -exit 1 -fi - - -extension=$(php < ${release}/release.zip - -cd ${release} -unzip release.zip -d ./ -rm release.zip - -# Delete files -rm -rf ${release}/build.sh - -# Install all Composer dependencies -composer install --prefer-dist --optimize-autoloader --ignore-platform-reqs --no-dev - -cd "${release}/js" -if [ -f bower.json ]; then -bower install -fi - -for app in forum admin; do - cd "${release}/js" - - if [ -d $app ]; then - cd $app - - if [ -f bower.json ]; then - bower install - fi - - npm install - gulp --production - rm -rf node_modules bower_components - fi -done - -rm -rf "${release}/extensions/${extension}/js/bower_components" -wait - -# Finally, create the release archive -cd ${release} -find . -type d -exec chmod 0750 {} + -find . -type f -exec chmod 0644 {} + -chmod 0775 . -zip -r ${extension}.zip ./ -mv ${extension}.zip ${base}/${extension}.zip