dia.CellView: use util.result for presentationAttributes and initFlag (…

…#1506)
clientIO · Aug 18, 2021 · 0461ff6 · 0461ff6
1 parent 19244ca
commit 0461ff6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/dia/CellView.mjs b/src/dia/CellView.mjs
@@ -12,6 +12,7 @@ import {
     isEmpty,
     isString,
     toKebabCase,
+    result,
     sortedIndex,
     merge,
     uniq
@@ -66,7 +67,7 @@ export const CellView = View.extend({
         var attributes = {};
         var shift = 0;
         var i, n, label;
-        var presentationAttributes = this.presentationAttributes;
+        var presentationAttributes = result(this, 'presentationAttributes');
         for (var attribute in presentationAttributes) {
             if (!presentationAttributes.hasOwnProperty(attribute)) continue;
             var labels = presentationAttributes[attribute];
@@ -80,7 +81,7 @@ export const CellView = View.extend({
                 attributes[attribute] |= flag;
             }
         }
-        var initFlag = this.initFlag;
+        var initFlag = result(this, 'initFlag');
         if (!Array.isArray(initFlag)) initFlag = [initFlag];
         for (i = 0, n = initFlag.length; i < n; i++) {
             label = initFlag[i];
@@ -1112,7 +1113,7 @@ export const CellView = View.extend({
     Highlighting: HighlightingTypes,
 
     addPresentationAttributes: function(presentationAttributes) {
-        return merge({}, this.prototype.presentationAttributes, presentationAttributes, function(a, b) {
+        return merge({}, result(this.prototype, 'presentationAttributes'), presentationAttributes, function(a, b) {
             if (!a || !b) return;
             if (typeof a === 'string') a = [a];
             if (typeof b === 'string') b = [b];

diff --git a/src/dia/Paper.mjs b/src/dia/Paper.mjs
@@ -16,6 +16,7 @@ import {
     isString,
     normalizeEvent,
     omit,
+    result,
     merge,
     camelCase,
     cloneDeep,
@@ -1450,7 +1451,7 @@ export const Paper = View.extend({
         } else {
             view = views[cell.id] = this.createViewForModel(cell);
             view.paper = this;
-            flag = this.registerUnmountedView(view) | view.getFlag(view.initFlag);
+            flag = this.registerUnmountedView(view) | view.getFlag(result(view, 'initFlag'));
         }
         this.requestViewUpdate(view, flag, view.UPDATE_PRIORITY, opt);
         return view;