Merge 3feff9a into 339f2a5

CometVisu · Aug 27, 2016 · 39ed7a2 · 39ed7a2
2 parents 339f2a5 + 3feff9a
commit 39ed7a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.doc/docutils/directives/widget_example.py b/.doc/docutils/directives/widget_example.py
@@ -189,15 +189,18 @@ def run(self):
             for screenshot in meta.iter('screenshot'):
                 shot = {
                     "name": screenshot.get("name", name + str(shot_index)),
-                    "data": {}
+                    "data": []
                 }
                 shot_index += 1
 
                 for data in screenshot.iter('data'):
-                    shot['data'][data.get("address", "0/0/0")] = data.text
+                    shot['data'].append({
+                        'address': data.get("address", "0/0/0"),
+                        'value': data.text
+                    })
 
                 for caption in screenshot.iter('caption'):
-                    if not 'caption' in shot:
+                    if 'caption' not in shot:
                         shot['caption'] = caption.text
                     else:
                         shot['caption'] += caption.text

diff --git a/.doc/plugins/widget_example.js b/.doc/plugins/widget_example.js
@@ -142,12 +142,15 @@ exports.handlers = {
             if (node.name() == "screenshot") {
               var shot = {
                 name: node.attr("name").value() || name + shotIndex,
-                data: {}};
+                data: []};
               node.childNodes().forEach(function (node) {
                 if (node.name() == "caption") {
                   shot.caption = node.text();
                 } else if (node.name() == "data") {
-                  shot.data[node.attr("address").value()] = node.text()
+                  shot.data.push({
+                    'address': node.attr("address").value(),
+                    'value': node.text()
+                  });
                 }
               });
               settings.screenshots.push(shot);

diff --git a/.doc/screenshots-spec.js b/.doc/screenshots-spec.js
@@ -192,8 +192,11 @@ describe('generation screenshots from jsdoc examples', function () {
                 return widget.isDisplayed();
               }, 1000).then(function() {
                 settings.screenshots.forEach(function(setting) {
-                  for (var ga in setting.data) {
-                    cvMockup.sendUpdate(ga, setting.data[ga]);
+
+                  if (setting.data && Array.isArray(setting.data)) {
+                    setting.data.forEach(function (data) {
+                      cvMockup.sendUpdate(data.address, data.value);
+                    });
                   }
 
                   widget.getSize().then(function (size) {