From fe94cb060098128b7085d91e51b84f52b73d4ba2 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 21 Aug 2014 03:03:11 -0400 Subject: [PATCH] refactor(minify) main.require -> tryRequire --- lib/server/minify.js | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/lib/server/minify.js b/lib/server/minify.js index 0d49c2cb..1116db44 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -1,25 +1,8 @@ -/* Обьект для сжатия скриптов и стилей */ - - (function() { +(function() { 'use strict'; - if(!global.cloudcmd) - return console.log( - '# minify.js' + '\n' + - '# -----------' + '\n' + - '# Module is part of Cloud Commander,' + '\n' + - '# used for work with minification.' + '\n' + - '# If you wont to see at work set minify' + '\n' + - '# parameters in config.json or environment' + '\n' + - '# and start cloudcmd.js' + '\n' + - '# http://cloudcmd.io' + '\n'); - - var main = global.cloudcmd.main, - Util = require('../util'), - Minify = main.require('minify'), - - COULD_NOT_MINIFY = 'Could not minify without minify module\n' + - 'npm i minify'; + var Util = require('../util'), + Minify = tryRequire('minify'); exports.optimize = function(name, params, callback) { Util.checkArgs(arguments, ['name', 'callback']); @@ -27,11 +10,19 @@ if (!callback) callback = params; - if (!Minify) { - Util.log(COULD_NOT_MINIFY); - callback(); - } else { + if (Minify) Minify.optimize(name, params, callback); - } + else + callback(); }; + + function tryRequire(name) { + var module; + + Util.exec.try(function() { + module = require(name); + }); + + return module; + } })();