Move ids file to svg subdirectory, since it's SVG specific.

artasparks · Jun 9, 2016 · 99a30a9 · 99a30a9
1 parent 7898257
commit 99a30a9
Show file tree

Hide file tree

Showing 15 changed files with 235 additions and 178 deletions.
diff --git a/src/glift-ui/displays/board/board.js b/src/glift-ui/displays/board/board.js
@@ -109,7 +109,7 @@ glift.displays.board.Display.prototype = {
     var svg = this.svg_;
     var divId = this.divId();
     var svglib = glift.displays.svg;
-    var idGen = glift.displays.ids.generator(divId);
+    var idGen = glift.displays.svg.ids.gen(divId);
     var goBox = env.goBoardBox;
     if (svg === null) {
       throw new Error('Base SVG object not initialized.');

diff --git a/src/glift-ui/displays/board/board_base.js b/src/glift-ui/displays/board/board_base.js
@@ -6,7 +6,7 @@ goog.require('glift.displays.svg');
  * fill color and a border.
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.orientation.BoundingBox} goBox The bounding box of the go board.
  * @param {!glift.themes.base} theme The theme object
  */

diff --git a/src/glift-ui/displays/board/board_labels.js b/src/glift-ui/displays/board/board_labels.js
@@ -6,7 +6,7 @@ goog.require('glift.displays.board');
  * on the raw board (rather than on stones).
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  * @param {!glift.themes.base} theme The theme object
  */

diff --git a/src/glift-ui/displays/board/buttons.js b/src/glift-ui/displays/board/buttons.js
@@ -4,7 +4,7 @@ goog.require('glift.displays.board');
  * Create transparent buttons that overlay each intersection.
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  */
 glift.displays.board.buttons = function(svg, idGen, boardPoints) {

diff --git a/src/glift-ui/displays/board/intersections.js b/src/glift-ui/displays/board/intersections.js
@@ -21,7 +21,7 @@ glift.displays.board.Intersections = function(
   this.theme = theme;
   this.rotation = rotation;
   this.boardPoints = boardPoints;
-  this.idGen = glift.displays.ids.generator(this.divId);
+  this.idGen = glift.displays.svg.ids.gen(this.divId);
 
   /**
    * Defined during events.
@@ -261,11 +261,13 @@ glift.displays.board.Intersections.prototype = {
       var child = children[i]
       var pt = child.data();
       var starpoint =
-          this.svg.child(idGen.starpointGroup()).child(idGen.starpoint(pt))
+          this.svg.child(idGen.starpointGroup()).child(idGen.starpoint(
+              /** @type {!glift.Point} */ (pt)))
       if (starpoint) {
         starpoint.setAttr('opacity', 1).updateAttrInDom('opacity');
       }
-      var line = this.svg.child(idGen.lineGroup()).child(idGen.line(pt))
+      var line = this.svg.child(idGen.lineGroup()).child(idGen.line(
+          /** @type {!glift.Point} */ (pt)))
       if (line) {
         line.setAttr('opacity', 1).updateAttrInDom('opacity');
       }

diff --git a/src/glift-ui/displays/board/lines.js b/src/glift-ui/displays/board/lines.js
@@ -6,7 +6,7 @@ goog.require('glift.displays.board');
  * on the raw board (rather than on stones).
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  * @param {!glift.themes.base} theme The theme object
  */

diff --git a/src/glift-ui/displays/board/marks.js b/src/glift-ui/displays/board/marks.js
@@ -5,7 +5,7 @@
  * container.
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  */
 glift.displays.board.markContainer = function(svg, idGen) {
   svg.append(glift.displays.svg.group().setId(idGen.markGroup()));

diff --git a/src/glift-ui/displays/board/starpoints.js b/src/glift-ui/displays/board/starpoints.js
@@ -3,7 +3,7 @@
  * points are used
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  * @param {!glift.themes.base} theme The theme object
  */

diff --git a/src/glift-ui/displays/board/stones.js b/src/glift-ui/displays/board/stones.js
@@ -3,7 +3,7 @@
  * all exist at the time of GoBoard creation.
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  * @param {!glift.themes.base} theme The theme object
  */
@@ -32,7 +32,7 @@ glift.displays.board.stones = function(svg, idGen, boardPoints, theme) {
  * only created if the theme has a shadow.
  *
  * @param {!glift.displays.svg.SvgObj} svg Base svg obj
- * @param {!glift.displays.ids.Generator} idGen The ID generator for SVG.
+ * @param {!glift.displays.svg.IdGenerator} idGen The ID generator for SVG.
  * @param {!glift.displays.BoardPoints} boardPoints Board points object.
  * @param {!glift.themes.base} theme The theme object
  */

diff --git a/src/glift-ui/displays/icons/bar.js b/src/glift-ui/displays/icons/bar.js
@@ -68,7 +68,7 @@ glift.displays.icons.IconBar = function(options) {
   this.vertMargin = this.theme.icons.vertMargin;
   this.horzMargin = this.theme.icons.horzMargin;
   this.svg = undefined; // initialized by draw
-  this.idGen = glift.displays.ids.generator(this.divId);
+  this.idGen = glift.displays.svg.ids.gen(this.divId);
 
   // Data related to tool tips.
   this.tooltipTimer = undefined;

diff --git a/src/glift-ui/displays/icons/icon_selector.js b/src/glift-ui/displays/icons/icon_selector.js
@@ -91,7 +91,7 @@ glift.displays.icons.IconSelector.prototype = {
           .setId(columnId + '_svg')
           .setAttr('height', '100%')
           .setAttr('width', '100%');
-      var idGen = glift.displays.ids.generator(columnId);
+      var idGen = glift.displays.svg.ids.gen(columnId);
       var container = svglib.group().setId(idGen.iconGroup());
       svg.append(container);
       for (var i = 0, len = transforms.length; i < len; i++) {
@@ -121,7 +121,7 @@ glift.displays.icons.IconSelector.prototype = {
     var svglib = glift.displays.svg;
     for (var i = 0; i < this.iconList.length; i++) {
       var svg = this.svgColumnList[i];
-      var idGen = glift.displays.ids.generator(this.columnIdList[i]);
+      var idGen = glift.displays.svg.ids.gen(this.columnIdList[i]);
       var iconColumn = this.iconList[i];
       var container = svglib.group().setId(idGen.buttonGroup());
       svg.append(container);
@@ -150,7 +150,7 @@ glift.displays.icons.IconSelector.prototype = {
 
   setIconEvents: function(eventName, func) {
     for (var i = 0; i < this.iconList.length; i++) {
-      var idGen = glift.displays.ids.generator(this.columnIdList[i]);
+      var idGen = glift.displays.svg.ids.gen(this.columnIdList[i]);
       for (var j = 0; j < this.iconList[i].length; j++) {
         var icon = this.iconList[i][j];
         var buttonId = idGen.button(icon.iconName);

diff --git a/src/glift-ui/displays/ids.js b/src/glift-ui/displays/ids.js