Browse Source

Merge pull request #19044 from Mugen87/dev45

Global: More clean up.
Mr.doob 5 years ago
parent
commit
d321dfed0d

+ 1 - 1
editor/js/libs/codemirror/codemirror.js

@@ -8161,7 +8161,7 @@
     }
   };
 
-  var noHandlers = []
+  var noHandlers = [];
   function getHandlers(emitter, type, copy) {
     var arr = emitter._handlers && emitter._handlers[type]
     if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers

+ 1 - 1
editor/js/libs/ternjs/tern.js

@@ -955,7 +955,7 @@
       var p = expr.node.property;
       expr.node = expr.node.object;
       return findRefsToProperty(srv, query, expr, p);
-    } else if (expr && expr.node.type == "ObjectExpression") {
+    } else if (expr.node.type == "ObjectExpression") {
       var pos = resolvePos(file, query.end);
       for (var i = 0; i < expr.node.properties.length; ++i) {
         var k = expr.node.properties[i].key;

+ 3 - 2
examples/jsm/libs/dat.gui.module.js

@@ -285,7 +285,7 @@ var Common = {
 	},
 	isFunction: function isFunction( obj ) {
 
-		return Object.prototype.toString.call( obj ) === '[object Function]';
+		return obj instanceof Function;
 
 	}
 };
@@ -959,9 +959,10 @@ Object.defineProperty( Color.prototype, 'a', {
 Object.defineProperty( Color.prototype, 'hex', {
 	get: function get$$1() {
 
-		if ( ! this.__state.space !== 'HEX' ) {
+		if ( this.__state.space !== 'HEX' ) {
 
 			this.__state.hex = ColorMath.rgb_to_hex( this.r, this.g, this.b );
+			this.__state.space = 'HEX';
 
 		}
 		return this.__state.hex;