1
0
Herbert Vojčík 9 роки тому
батько
коміт
47e6b60265

+ 1 - 1
external/amber-cli/support/amberc-cli.js

@@ -33,7 +33,7 @@ function handle_options(optionsArray) {
     var currentItem = optionsArray.shift();
     var defaults = amberc.createDefaultConfiguration();
 
-    while (undefined !== currentItem) {
+    while (currentItem != null) {
         switch (currentItem) {
             case '-l':
                 defaults.load.push.apply(defaults.load, optionsArray.shift().split(','));

+ 4 - 4
external/amber-dev/lib/amberc.js

@@ -66,7 +66,7 @@ var path = require('path'),
  * amber_dir: points to the location of an amber installation
  */
 function AmberCompiler(amber_dir) {
-    if (undefined === amber_dir || !fs.existsSync(amber_dir)) {
+    if (amber_dir == null || !fs.existsSync(amber_dir)) {
         throw new Error('amber_dir needs to be a valid directory');
     }
 
@@ -111,7 +111,7 @@ AmberCompiler.prototype.main = function (configuration, finished_callback) {
         configuration.amd_namespace = 'amber_core';
     }
 
-    if (undefined !== configuration.jsLibraryDirs) {
+    if (configuration.jsLibraryDirs != null) {
         configuration.jsLibraryDirs.push(path.join(this.amber_dir, 'src'));
         configuration.jsLibraryDirs.push(path.join(this.amber_dir, 'support'));
     }
@@ -154,7 +154,7 @@ AmberCompiler.prototype.main = function (configuration, finished_callback) {
  */
 function check_configuration(configuration) {
     return new Promise(function (resolve, reject) {
-        if (undefined === configuration) {
+        if (configuration == null) {
             reject(Error('AmberCompiler.check_configuration_ok(): missing configuration object'));
         }
 
@@ -439,7 +439,7 @@ function category_export(configuration) {
             return new Promise(function (resolve, reject) {
                 var category = path.basename(stFile, '.st');
                 var jsFilePath = configuration.output_dir;
-                if (undefined === jsFilePath) {
+                if (jsFilePath == null) {
                     jsFilePath = path.dirname(stFile);
                 }
                 var jsFile = category + '.js';

+ 12 - 14
external/amber-dev/tasks/grunt-amberc.js

@@ -71,30 +71,28 @@ module.exports = function (grunt) {
 
     function generateCompilerConfiguration(data, sourceFiles) {
         var configuration = amberc.createDefaultConfiguration();
-        var parameters = [];
 
-        var libraries = data.libraries;
-        if (undefined !== libraries) {
-            configuration.load = libraries;
+        if (data.libraries != null) {
+            configuration.load = data.libraries;
         }
-        var library_dirs = data.library_dirs;
-        if (undefined !== library_dirs) {
-            configuration.jsLibraryDirs = library_dirs;
+        if (data.library_dirs != nukk) {
+            configuration.jsLibraryDirs = data.library_dirs;
         }
-        if (undefined !== sourceFiles) {
+        if (sourceFiles != null) {
             configuration.stFiles = sourceFiles;
         }
-        var amdNamespace = data.amd_namespace;
-        if (undefined !== amdNamespace) {
-            configuration.amd_namespace = amdNamespace;
+        if (data.amd_namespace != null) {
+            configuration.amd_namespace = data.amd_namespace;
         }
-        if (undefined !== data.output_dir) {
+        if (data.output_dir != null) {
             configuration.output_dir = data.output_dir;
         }
-        if (undefined !== data.jsGlobals) {
+        if (data.jsGlobals != null) {
             configuration.jsGlobals.push.apply(configuration.jsGlobals, data.jsGlobals);
         }
-        configuration.verbose = data.verbose;
+        if (data.verbose != null) {
+            configuration.verbose = data.verbose;
+        }
         return configuration;
     }
 };