Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2016-present Open Networking Laboratory |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | /* |
| 18 | ONOS GUI -- Topology Links Module. |
| 19 | Module that holds the links for a region |
| 20 | */ |
| 21 | |
| 22 | (function () { |
| 23 | 'use strict'; |
| 24 | |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 25 | var $log, Collection, Model, ts, sus, t2zs, t2vs, t2lps, fn; |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 26 | |
| 27 | var linkLabelOffset = '0.35em'; |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 28 | |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 29 | var widthRatio = 1.4, |
| 30 | linkScale = d3.scale.linear() |
| 31 | .domain([1, 12]) |
| 32 | .range([widthRatio, 12 * widthRatio]) |
| 33 | .clamp(true), |
Steven Burrows | 583f4be | 2016-11-04 14:06:50 +0100 | [diff] [blame] | 34 | allLinkTypes = 'direct optical tunnel UiDeviceLink', |
| 35 | allLinkSubTypes = 'not-permitted', |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 36 | labelDim = 30; |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 37 | |
| 38 | // configuration |
| 39 | var linkConfig = { |
| 40 | light: { |
| 41 | baseColor: '#939598', |
| 42 | inColor: '#66f', |
| 43 | outColor: '#f00' |
| 44 | }, |
| 45 | dark: { |
| 46 | // TODO : theme |
| 47 | baseColor: '#939598', |
| 48 | inColor: '#66f', |
| 49 | outColor: '#f00' |
| 50 | }, |
| 51 | inWidth: 12, |
| 52 | outWidth: 10 |
| 53 | }; |
| 54 | |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 55 | function createLink() { |
| 56 | |
| 57 | var linkPoints = this.linkEndPoints(this.get('epA'), this.get('epB')); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 58 | |
| 59 | var attrs = angular.extend({}, linkPoints, { |
| 60 | key: this.get('id'), |
| 61 | class: 'link', |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 62 | srcPort: this.get('srcPort'), |
| 63 | tgtPort: this.get('dstPort'), |
| 64 | position: { |
| 65 | x1: 0, |
| 66 | y1: 0, |
| 67 | x2: 0, |
| 68 | y2: 0 |
| 69 | } |
| 70 | // functions to aggregate dual link state |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 71 | // extra: link.extra |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 72 | }); |
| 73 | |
| 74 | this.set(attrs); |
| 75 | } |
| 76 | |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 77 | function rectAroundText(el) { |
| 78 | var text = el.select('text'), |
| 79 | box = text.node().getBBox(); |
| 80 | |
| 81 | // translate the bbox so that it is centered on [x,y] |
| 82 | box.x = -box.width / 2; |
| 83 | box.y = -box.height / 2; |
| 84 | |
| 85 | // add padding |
| 86 | box.x -= 4; |
| 87 | box.width += 8; |
| 88 | return box; |
| 89 | } |
| 90 | |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 91 | function isLinkOnline(node) { |
| 92 | return (node.get('nodeType') === 'region') ? true : node.get('online'); |
| 93 | } |
| 94 | |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 95 | function linkEndPoints(srcId, dstId) { |
| 96 | |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 97 | var findNodeById = this.region.model.findNodeById.bind(this.region), |
| 98 | allNodes = this.region.model.nodes(), |
| 99 | sourceNode = findNodeById(this, srcId), |
| 100 | targetNode = findNodeById(this, dstId); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 101 | |
Steven Burrows | 6deb4ce | 2016-08-26 16:06:23 +0100 | [diff] [blame] | 102 | if (!sourceNode || !targetNode) { |
Steven Burrows | 8f45ce2 | 2016-10-27 20:04:14 -0500 | [diff] [blame] | 103 | $log.error('Node(s) not on map for link:' + srcId + '~' + dstId); |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 104 | // logicError('Node(s) not on map for link:\n' + sMiss + dMiss); |
Steven Burrows | 6deb4ce | 2016-08-26 16:06:23 +0100 | [diff] [blame] | 105 | return null; |
| 106 | } |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 107 | |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 108 | this.source = allNodes.indexOf(sourceNode); |
| 109 | this.target = allNodes.indexOf(targetNode); |
| 110 | this.sourceNode = sourceNode; |
| 111 | this.targetNode = targetNode; |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 112 | |
| 113 | return { |
| 114 | source: sourceNode, |
| 115 | target: targetNode |
| 116 | }; |
| 117 | } |
| 118 | |
| 119 | function createLinkCollection(data, _region) { |
| 120 | |
| 121 | var LinkModel = Model.extend({ |
| 122 | region: _region, |
| 123 | createLink: createLink, |
| 124 | linkEndPoints: linkEndPoints, |
| 125 | type: function () { |
| 126 | return this.get('type'); |
| 127 | }, |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 128 | svgClassName: function () { |
| 129 | return fn.classNames('link', |
| 130 | this.nodeType, |
| 131 | this.get('type'), |
| 132 | { |
| 133 | enhanced: this.get('enhanced'), |
| 134 | selected: this.get('selected') |
| 135 | } |
| 136 | ); |
| 137 | }, |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 138 | expected: function () { |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 139 | // TODO: original code is: (s && s.expected) && (t && t.expected); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 140 | return true; |
| 141 | }, |
| 142 | online: function () { |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 143 | |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 144 | var source = this.get('source'), |
| 145 | target = this.get('target'), |
| 146 | sourceOnline = isLinkOnline(source), |
| 147 | targetOnline = isLinkOnline(target); |
| 148 | |
| 149 | return (sourceOnline) && (targetOnline); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 150 | }, |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 151 | onChange: function () { |
| 152 | // Update class names when the model changes |
| 153 | if (this.el) { |
| 154 | this.el.attr('class', this.svgClassName()); |
| 155 | } |
| 156 | }, |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 157 | enhance: function () { |
| 158 | var data = [], |
| 159 | point; |
| 160 | |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 161 | if (showPort()) { |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 162 | this.set('enhanced', true); |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 163 | point = this.locatePortLabel(); |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 164 | angular.extend(point, { |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 165 | id: 'topo-port-tgt', |
| 166 | num: this.get('portB') |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 167 | }); |
| 168 | data.push(point); |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 169 | |
| 170 | if (this.get('portA')) { |
| 171 | point = this.locatePortLabel(1); |
| 172 | angular.extend(point, { |
| 173 | id: 'topo-port-src', |
| 174 | num: this.get('portA') |
| 175 | }); |
| 176 | data.push(point); |
| 177 | } |
| 178 | |
| 179 | var entering = d3.select('#topo-portLabels') |
| 180 | .selectAll('.portLabel') |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 181 | .data(data) |
| 182 | .enter().append('g') |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 183 | .classed('portLabel', true) |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 184 | .attr('id', function (d) { return d.id; }); |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 185 | |
| 186 | entering.each(function (d) { |
| 187 | var el = d3.select(this), |
| 188 | rect = el.append('rect'), |
| 189 | text = el.append('text').text(d.num); |
| 190 | |
| 191 | var rectSize = rectAroundText(el); |
| 192 | |
| 193 | rect.attr(rectSize) |
| 194 | .attr('rx', 2) |
| 195 | .attr('ry', 2); |
| 196 | |
| 197 | text.attr('dy', linkLabelOffset) |
| 198 | .attr('text-anchor', 'middle'); |
| 199 | |
| 200 | el.attr('transform', sus.translate(d.x, d.y)); |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 201 | |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 202 | }); |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 203 | |
| 204 | this.setScale(); |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 205 | } |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 206 | }, |
| 207 | unenhance: function () { |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 208 | this.set('enhanced', false); |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 209 | d3.select('#topo-portLabels').selectAll('.portLabel').remove(); |
| 210 | }, |
Steven Burrows | 1aa4f58 | 2016-12-13 15:05:41 -0500 | [diff] [blame] | 211 | getSelected: function () { |
| 212 | return this.collection.filter(function (m) { |
| 213 | return m.get('selected'); |
| 214 | }); |
| 215 | }, |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 216 | select: function () { |
Steven Burrows | 1aa4f58 | 2016-12-13 15:05:41 -0500 | [diff] [blame] | 217 | |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 218 | // TODO: if single selection clear selected devices, hosts, sub-regions |
| 219 | var s = Boolean(this.get('selected')); |
| 220 | // Clear all selected Items |
| 221 | _.each(this.collection.models, function (m) { |
| 222 | m.set('selected', false); |
| 223 | }); |
| 224 | |
| 225 | this.set('selected', !s); |
Steven Burrows | 1aa4f58 | 2016-12-13 15:05:41 -0500 | [diff] [blame] | 226 | this.showDetails(); |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 227 | |
Steven Burrows | 1aa4f58 | 2016-12-13 15:05:41 -0500 | [diff] [blame] | 228 | return this.getSelected(); |
| 229 | }, |
| 230 | deselect: function () { |
| 231 | this.set('selected', false); |
| 232 | this.set('enhanced', false); |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 233 | }, |
| 234 | showDetails: function () { |
Steven Burrows | 1aa4f58 | 2016-12-13 15:05:41 -0500 | [diff] [blame] | 235 | var selected = this.getSelected(); |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 236 | |
| 237 | if (selected) { |
| 238 | t2lps.displayLink(this); |
| 239 | } else { |
| 240 | t2lps.hide(); |
| 241 | } |
| 242 | }, |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 243 | locatePortLabel: function (src) { |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 244 | |
| 245 | var offset = 32 / (labelDim * t2zs.scale()), |
| 246 | sourceX = this.get('position').x1, |
| 247 | sourceY = this.get('position').y1, |
| 248 | targetX = this.get('position').x2, |
| 249 | targetY = this.get('position').y2, |
| 250 | nearX = src ? sourceX : targetX, |
| 251 | nearY = src ? sourceY : targetY, |
| 252 | farX = src ? targetX : sourceX, |
| 253 | farY = src ? targetY : sourceY; |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 254 | |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 255 | function dist(x, y) { |
| 256 | return Math.sqrt(x * x + y * y); |
| 257 | } |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 258 | |
| 259 | var dx = farX - nearX, |
| 260 | dy = farY - nearY, |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 261 | k = (32 * offset) / dist(dx, dy); |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 262 | |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 263 | return { x: k * dx + nearX, y: k * dy + nearY }; |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 264 | }, |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 265 | restyleLinkElement: function (immediate) { |
| 266 | // this fn's job is to look at raw links and decide what svg classes |
| 267 | // need to be applied to the line element in the DOM |
| 268 | var th = ts.theme(), |
| 269 | el = this.el, |
| 270 | type = this.get('type'), |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 271 | online = this.online(), |
Steven Burrows | 583f4be | 2016-11-04 14:06:50 +0100 | [diff] [blame] | 272 | modeCls = this.expected() ? '-inactive' : 'not-permitted', |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 273 | delay = immediate ? 0 : 1000; |
| 274 | |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 275 | // NOTE: understand why el is sometimes undefined on addLink events... |
| 276 | // Investigated: |
| 277 | // el is undefined when it's a reverse link that is being added. |
| 278 | // updateLinks (which sets ldata.el) isn't called before this is called. |
| 279 | // Calling _updateLinks in addLinkUpdate fixes it, but there might be |
| 280 | // a more efficient way to fix it. |
| 281 | if (el && !el.empty()) { |
| 282 | el.classed('link', true); |
| 283 | el.classed(allLinkSubTypes, false); |
| 284 | el.classed(modeCls, !online); |
| 285 | el.classed(allLinkTypes, false); |
| 286 | if (type) { |
| 287 | el.classed(type, true); |
| 288 | } |
| 289 | el.transition() |
| 290 | .duration(delay) |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 291 | .attr('stroke', linkConfig[th].baseColor); |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 292 | |
| 293 | this.setScale(); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 294 | } |
| 295 | }, |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 296 | onEnter: function (el) { |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 297 | var link = d3.select(el); |
Steven Burrows | 9edc7e0 | 2016-08-29 11:52:07 +0100 | [diff] [blame] | 298 | |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 299 | this.el = link; |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 300 | this.restyleLinkElement(); |
| 301 | |
| 302 | if (this.get('type') === 'hostLink') { |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 303 | // sus.visible(link, api.showHosts()); |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 304 | } |
Steven Burrows | 0616e80 | 2016-10-06 21:45:07 -0500 | [diff] [blame] | 305 | }, |
| 306 | setScale: function () { |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 307 | var width = linkScale(widthRatio) / t2zs.scale(); |
Steven Burrows | 0616e80 | 2016-10-06 21:45:07 -0500 | [diff] [blame] | 308 | this.el.style('stroke-width', width + 'px'); |
Steven Burrows | a3fca81 | 2016-10-14 15:11:04 -0500 | [diff] [blame] | 309 | |
| 310 | var labelScale = labelDim / (labelDim * t2zs.scale()); |
| 311 | |
| 312 | d3.select('#topo-portLabels') |
| 313 | .selectAll('.portLabel') |
| 314 | .selectAll('*') |
| 315 | .style('transform', 'scale(' + labelScale + ')'); |
| 316 | |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 317 | }, |
| 318 | update: function () { |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 319 | if (this.get('enhanced')) { |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 320 | this.enhance(); |
| 321 | } |
Steven Burrows | ec1f45c | 2016-08-08 16:14:41 +0100 | [diff] [blame] | 322 | } |
| 323 | }); |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 324 | |
| 325 | var LinkCollection = Collection.extend({ |
Steven Burrows | dfa52b0 | 2016-09-02 13:50:43 +0100 | [diff] [blame] | 326 | model: LinkModel |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 327 | }); |
| 328 | |
| 329 | return new LinkCollection(data); |
| 330 | } |
| 331 | |
Steven Burrows | 1c5c861 | 2016-10-05 13:45:13 -0500 | [diff] [blame] | 332 | function showPort() { |
| 333 | return t2vs.getPortHighlighting(); |
| 334 | } |
| 335 | |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 336 | angular.module('ovTopo2') |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 337 | .factory('Topo2LinkService', [ |
| 338 | '$log', 'Topo2Collection', 'Topo2Model', |
Steven Burrows | 0616e80 | 2016-10-06 21:45:07 -0500 | [diff] [blame] | 339 | 'ThemeService', 'SvgUtilService', 'Topo2ZoomService', |
Steven Burrows | 86af435 | 2016-11-16 18:19:12 -0600 | [diff] [blame] | 340 | 'Topo2ViewService', 'Topo2LinkPanelService', 'FnService', |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 341 | function (_$log_, _c_, _Model_, _ts_, _sus_, |
| 342 | _t2zs_, _t2vs_, _t2lps_, _fn_) { |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 343 | |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 344 | $log = _$log_; |
| 345 | ts = _ts_; |
| 346 | sus = _sus_; |
| 347 | t2zs = _t2zs_; |
| 348 | t2vs = _t2vs_; |
| 349 | Collection = _c_; |
| 350 | Model = _Model_; |
| 351 | t2lps = _t2lps_; |
| 352 | fn = _fn_; |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 353 | |
Steven Burrows | af96a21 | 2016-12-28 12:57:02 +0000 | [diff] [blame^] | 354 | return { |
| 355 | createLinkCollection: createLinkCollection |
| 356 | }; |
| 357 | } |
| 358 | ]); |
Steven Burrows | 57e24e9 | 2016-08-04 18:38:24 +0100 | [diff] [blame] | 359 | })(); |