Merge pull request #677 from Luthaf/more-ts-changes

TypeScript: LabelsSpec.alignment can also be a Vector2

src/GLViewer.ts

@@ -3623,7 +3623,7 @@ export class GLViewer {
      * @param {boolean} clickable - whether click-handling is enabled for the selection
      * @param {function} callback - function called when an atom in the selection is clicked. The function is passed
      * the selected (foremost) object, the viewer, the triggering event, the associated container, and a list
-     * of all intersecting objects with their distances from the viewer. 
+     * of all intersecting objects with their distances from the viewer.
      *
      * @example
         $3Dmol.download("cid:307900",viewer,{},function(){
@@ -4101,7 +4101,7 @@ export class GLViewer {
         let surfid = this.nextSurfID();
         let mat = null;
         let self = this;
-        let type:SurfaceType = SurfaceType.VDW;
+        let type: SurfaceType | 0 = SurfaceType.VDW;
 
         if (typeof stype == "string") {
             if (GLViewer.surfaceTypeMap[stype.toUpperCase()] !== undefined)

src/Label.ts

@@ -83,8 +83,10 @@ export interface LabelSpec {
   useScreen?: boolean;
   /** An elment to draw into the label. Any CanvasImageSource is allowed.  Label is resized to size of image */
   backgroundImage?: any;
-  /** how to orient the label w/respect to position: topLeft (default), topCenter, topRight, centerLeft, center, centerRight, bottomLeft, bottomCenter, bottomRight */
-  alignment?: string;
+  /** how to orient the label w/respect to position: "topLeft" (default),
+   * "topCenter", "topRight", "centerLeft", "center", "centerRight",
+   * "bottomLeft", "bottomCenter", "bottomRight", or an arbitrary offset */
+  alignment?: string | Vector2;
   /** if set, only display in this frame of an animation */
   frame?: number;
 }
@@ -272,7 +274,7 @@ export class Label {
       );
     }
 
-    if (style.backgroundImage) {      
+    if (style.backgroundImage) {
       this.context.drawImage(img, 0, 0, width, height);
     }