← Back to branch summary

~benji/juju-gui/bug-1200412

« back to all changes in this revision

Viewing changes to test/test_view_container.js

  • Committer: Benji York
  • Date: 2013-07-12 18:21:37 UTC
  • mfrom: (822.1.2 juju-gui)
  • Revision ID: benji.york@canonical.com-20130712182137-2xyt9je6pbr3gxxr
merge from trunk (fixing conflicts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/test_view_container.js
34
34
 
35
35
 
36
36
    viewContainer = new Y.juju.views.ViewContainer({
 
37
      databinding: {
 
38
        interval: 0
 
39
      },
37
40
      viewlets: {
38
41
        serviceConfig: Y.merge(viewletConfig),
39
42
        constraints: Y.merge(viewletConfig)