Merge pull request #101 from chuckdumont/work

streamline subclassCallDefineHandler implementation

Author: Chuck Dumont

lib/DojoAMDDefineDependencyParserPlugin.js

@@ -43,22 +43,20 @@ module.exports = class DojoAMDDefineDependencyParserPlugin extends AMDDefineDepe
 	subclassCallDefineHandler(parser) {
 		// "Subclasses" the 'call define' handler in the base class implementation.  This is a bit
 		// painful because the base class is not set up to support subclassing, but we manage by
-		// replacing the parser plugin handler for the duration of the apply call in the super
+		// replacing the parser plugin handler for the duration of the plugin call in the super
 		// class and then grabbing the 'call define' callback so that we can use it for our own
 		// 'call define' handler.
-		var original_plugin;
-		if (parser.hasOwnProperty("plugin")) {
-			original_plugin = parser.plugin;
-		}
+		const original_plugin = parser.plugin;
+		const restore_original_plugin = parser.hasOwnProperty("plugin");
 		parser.plugin = (expression, callback) => {
 			if (expression === "call define") {
 				// Augment base class implementation for "call define"
-				(original_plugin || parser.__proto__.plugin).call(parser, expression, this.callDefine.bind(this, callback, parser));
+				original_plugin.call(parser, expression, this.callDefine.bind(this, callback, parser));
 			}
 		};
 		super.apply(parser);
 		delete parser.plugin;
-		if (original_plugin) {
+		if (restore_original_plugin) {
 			parser.plugin = original_plugin;
 		}
 	}