feat(release): fix resource color splash and hasOwnProperty bug

fex-team · Mar 23, 2017 · bac91ac · bac91ac
1 parent a20e2a1
commit bac91ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
     "name": "kityminder-core",
     "title": "Kity Minder Core",
     "description": "Powerful online mind graphic visualization and editor (command based)",
-    "version": "1.4.36",
+    "version": "1.4.37",
     "main": [
         "dist/kityminder.core.min.js",
         "dist/kityminder.core.css"

diff --git a/dist/kityminder.core.js b/dist/kityminder.core.js
@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * kityminder - v1.4.36 - 2017-03-10
+ * kityminder - v1.4.37 - 2017-03-23
  * https://github.com/fex-team/kityminder-core
  * GitHub: https://github.com/fex-team/kityminder-core.git 
  * Copyright (c) 2017 Baidu FEX; Licensed MIT
@@ -1969,7 +1969,7 @@ _p[19] = {
                 this.fire("finishInitHook");
             }
         });
-        Minder.version = "1.4.36";
+        Minder.version = "1.4.37";
         Minder.registerInitHook = function(hook) {
             _initHooks.push(hook);
         };
@@ -6660,7 +6660,7 @@ _p[57] = {
                 getResourceColor: function(resource) {
                     var colorMapping = this._getResourceColorIndexMapping();
                     var nextIndex;
-                    if (!colorMapping.__proto__.hasOwnProperty(resource)) {
+                    if (!Object.prototype.hasOwnProperty.call(colorMapping, resource)) {
                         // 找不到找下个可用索引
                         nextIndex = this._getNextResourceColorIndex();
                         colorMapping[resource] = nextIndex;
@@ -6677,7 +6677,7 @@ _p[57] = {
                     var mapping = this._getResourceColorIndexMapping();
                     var used = [], resource;
                     for (resource in mapping) {
-                        if (mapping.hasOwnProperty(resource)) {
+                        if (Object.prototype.hasOwnProperty.call(mapping, resource)) {
                             used.push(resource);
                         }
                     }
@@ -6696,7 +6696,7 @@ _p[57] = {
                     used = [];
                     // 抽取已经使用的值到 used 数组
                     for (resource in colorMapping) {
-                        if (colorMapping.hasOwnProperty(resource)) {
+                        if (Object.prototype.hasOwnProperty.call(colorMapping, resource)) {
                             used.push(colorMapping[resource]);
                         }
                     }

diff --git a/dist/kityminder.core.min.js b/dist/kityminder.core.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "kityminder",
   "title": "kityminder",
   "description": "KityMinder Core Implement",
-  "version": "1.4.36",
+  "version": "1.4.37",
   "homepage": "https://github.com/fex-team/kityminder-core",
   "author": {
     "name": "Baidu FEX",

diff --git a/src/core/minder.js b/src/core/minder.js
@@ -30,7 +30,7 @@ define(function(require, exports, module) {
         }
     });
 
-    Minder.version = '1.4.36';
+    Minder.version = '1.4.37';
 
     Minder.registerInitHook = function(hook) {
         _initHooks.push(hook);