Merge lp:~marcustomlinson/unity-js-scopes/lp-1543059 into lp:unity-js-scopes

[Marcus Tomlinson]

Deal with non-dict types for variant arrays in PreviewWidget::add_attribute_value()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/77/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'src/bindings/src/preview-widget.cc'
--- src/bindings/src/preview-widget.cc	2016-02-04 10:12:41 +0000
+++ src/bindings/src/preview-widget.cc	2016-02-11 05:19:56 +0000
@@ -89,19 +89,30 @@
     if (v.which() == unity::scopes::Variant::Array) {
       unity::scopes::VariantArray va = v.get_array();
 
-      for (auto &d : va) {
-        if (d.which() == unity::scopes::Variant::Dict) {
-          unity::scopes::VariantMap vm = d.get_dict();
-          std::vector<std::pair<std::string, unity::scopes::Variant>> t;
-
-          for (auto &c : vm) {
-            t.push_back({c.first, c.second});
+      if (va.empty())
+      {
+        return;
+      }
+      else if (va.front().which() == unity::scopes::Variant::Dict)
+      {
+        for (auto &d : va) {
+          if (d.which() == unity::scopes::Variant::Dict) {
+            unity::scopes::VariantMap vm = d.get_dict();
+            std::vector<std::pair<std::string, unity::scopes::Variant>> t;
+
+            for (auto &c : vm) {
+              t.push_back({c.first, c.second});
+            }
+
+            vb.add_tuple(t);
           }
-
-          vb.add_tuple(t);
         }
-      }
-      preview_widget_->add_attribute_value(key, vb.end());
+        preview_widget_->add_attribute_value(key, vb.end());
+      }
+      else
+      {
+        preview_widget_->add_attribute_value(key, v);
+      }
     }
     else if (v.which() == unity::scopes::Variant::Dict) {
       unity::scopes::VariantMap vm = v.get_dict();