Merge pull request #1016 from atom/ku-next-diff-please

[WIP] Use Atom opener to display file diff

Author: kuychaco

lib/atom-items/stub-item.js

@@ -1,66 +1,57 @@
 import {Emitter, CompositeDisposable} from 'event-kit';
 
+let key = 0;
 export default class StubItem {
-  static stubsBySelector = new Map()
-
   // StubItems should only be created by `create` and never constructed directly.
-  static create(selector, props) {
-    const stub = new StubItem(selector, props);
+  static create(name, props, uri = '') {
+    const stub = new StubItem(name, props, uri);
     const override = {
       _getStub: () => stub,
       getElement: () => stub.getElement(),
       destroy: stub.destroy.bind(stub),
     };
     const proxy = new Proxy(override, {
-      get(target, name) {
+      get(target, propName) {
         const item = stub.getRealItem();
-        if (Reflect.has(target, name)) {
-          return target[name];
-        } else if (item && Reflect.has(item, name)) {
-          let val = item[name];
+        if (Reflect.has(target, propName)) {
+          return target[propName];
+        } else if (item && Reflect.has(item, propName)) {
+          let val = item[propName];
           if (typeof val === 'function') {
             val = val.bind(item);
           }
           return val;
         } else {
-          let val = stub[name];
+          let val = stub[propName];
           if (typeof val === 'function') {
             val = val.bind(stub);
           }
           return val;
         }
       },
     });
-    this.stubsBySelector.set(selector, proxy);
     return proxy;
   }
 
-  static getBySelector(selector) {
-    return this.stubsBySelector.get(selector);
-  }
-
-  static getElementBySelector(selector) {
-    const stub = this.getBySelector(selector);
-    if (stub) {
-      return stub.getElement();
-    } else {
-      return null;
-    }
-  }
-
-  constructor(selector, props = {}) {
+  constructor(name, props = {}, uri) {
     this.emitter = new Emitter();
     this.subscriptions = new CompositeDisposable();
 
-    this.selector = selector;
+    this.name = name;
     this.props = props;
+    this.uri = uri;
+    this.key = ++key;
     this.element = document.createElement('div');
-    this.element.classList.add(`github-StubItem-${selector}`);
+    this.element.classList.add(`github-StubItem-${name}`);
     this.realItem = null;
+    this.realItemPromise = new Promise(res => {
+      this.resolveRealItemPromise = res;
+    });
   }
 
   setRealItem(item) {
     this.realItem = item;
+    this.resolveRealItemPromise();
     this.emitter.emit('did-change-title');
     this.emitter.emit('did-change-icon');
 
@@ -80,10 +71,18 @@ export default class StubItem {
     }
   }
 
+  getRealItemPromise() {
+    return this.realItemPromise;
+  }
+
   getRealItem() {
     return this.realItem;
   }
 
+  getURI() {
+    return this.uri;
+  }
+
   getTitle() {
     return this.props.title || null;
   }
@@ -111,9 +110,8 @@ export default class StubItem {
   destroy() {
     this.subscriptions.dispose();
     this.emitter.dispose();
-    StubItem.stubsBySelector.delete(this.selector);
-    if (this.actualItem) {
-      this.actualItem.destroy && this.actualItem.destroy();
+    if (this.realItem) {
+      this.realItem.destroy && this.realItem.destroy();
     }
   }
 }