1
=== modified file 'app/subapps/browser/views/minimized.js'
2
--- app/subapps/browser/views/minimized.js	2013-08-02 15:34:18 +0000
3
+++ app/subapps/browser/views/minimized.js	2013-08-21 14:26:55 +0000
4
@@ -30,6 +30,11 @@
5
30
  var ns = Y.namespace('juju.browser.views'),
30
  var ns = Y.namespace('juju.browser.views'),
6
31
      views = Y.namespace('juju.views');
31
      views = Y.namespace('juju.views');
7
32
32
8
33
  // XXX jcsackett Aug 21 2013 The minimized view currently dupes a bunch of
9
34
  // code from the Mainview. We can't just use mainview here b/c mainview
10
35
  // expects search stuff to exist, which is only true for the sidebar and
11
36
  // fullscreen views. When we add the search bar to always be present, we
12
37
  // should remove this duplication.
13
33
  /**
38
  /**
14
34
   * The minimized state view.
39
   * The minimized state view.
15
35
   *
40
   *
16
@@ -37,7 +42,9 @@
17
37
   * @extends {Y.View}
42
   * @extends {Y.View}
18
38
   *
43
   *
19
39
   */
44
   */
21
40
  ns.MinimizedView = Y.Base.create('browser-view-minimized', Y.View, [], {
45
  ns.MinimizedView = Y.Base.create('browser-view-minimized', Y.View, [
22
46
    Y.Event.EventTracker
23
47
  ], {
24
41
    template: views.Templates.minimized,
48
    template: views.Templates.minimized,
25
42
49
26
43
    events: {
50
    events: {
27
@@ -47,6 +54,62 @@
28
47
    },
54
    },
29
48
55
30
49
    /**
56
    /**
31
57
       Binds the viewmode control events to navigation.
32
58
33
59
       @method _bindViewmodeControls
34
60
     */
35
61
    _bindViewmodeControls: function() {
36
62
      var container = this.get('container');
37
63
      this.addEvent(
38
64
          this.controls.on(
39
65
              this.controls.EVT_TOGGLE_VIEWABLE, this._toggleViewState, this)
40
66
      );
41
67
42
68
      this.addEvent(
43
69
          this.controls.on(
44
70
              this.controls.EVT_FULLSCREEN, this._goFullscreen, this)
45
71
      );
46
72
      this.addEvent(
47
73
          this.controls.on(
48
74
              this.controls.EVT_SIDEBAR, this._goSidebar, this)
49
75
      );
50
76
    },
51
77
52
78
    /**
53
79
      Upon clicking the browser icon make sure we re-route to the
54
80
      new form of the UX.
55
81
56
82
      @method _goFullscreen
57
83
      @param {Event} ev the click event handler on the button.
58
84
59
85
     */
60
86
    _goFullscreen: function(ev) {
61
87
      ev.halt();
62
88
      this.fire('viewNavigate', {
63
89
        change: {
64
90
          viewmode: 'fullscreen'
65
91
        }
66
92
      });
67
93
    },
68
94
69
95
    /**
70
96
      Upon clicking the build icon make sure we re-route to the
71
97
      new form of the UX.
72
98
73
99
      @method _goSidebar
74
100
      @param {Event} ev the click event handler on the button.
75
101
76
102
     */
77
103
    _goSidebar: function(ev) {
78
104
      ev.halt();
79
105
      this.fire('viewNavigate', {
80
106
        change: {
81
107
          viewmode: 'sidebar'
82
108
        }
83
109
      });
84
110
    },
85
111
86
112
    /**
87
50
     * Toggle the visibility of the browser. Bound to nav controls in the
113
     * Toggle the visibility of the browser. Bound to nav controls in the
88
51
     * view, however this will be expanded to be controlled from the new
114
     * view, however this will be expanded to be controlled from the new
89
52
     * constant nav menu outside of the view once it's completed.
115
     * constant nav menu outside of the view once it's completed.
90
@@ -88,6 +151,13 @@
91
88
      var tpl = this.template(),
151
      var tpl = this.template(),
92
89
          tplNode = Y.Node.create(tpl);
152
          tplNode = Y.Node.create(tpl);
93
90
      this.get('container').setHTML(tplNode);
153
      this.get('container').setHTML(tplNode);
94
154
      // Make sure the controls starts out setting the correct active state
95
155
      // based on the current viewmode for our View.
96
156
      this.controls = new Y.juju.widgets.ViewmodeControls({
97
157
        currentViewmode: this.get('oldViewMode')
98
158
      });
99
159
      this.controls.render();
100
160
      this._bindViewmodeControls();
101
91
    }
161
    }
102
92
162
103
93
  }, {
163
  }, {
104
@@ -116,6 +186,7 @@
105
116
    'base',
186
    'base',
106
117
    'juju-templates',
187
    'juju-templates',
107
118
    'juju-views',
188
    'juju-views',
109
119
    'view'
189
    'view',
110
190
    'viewmode-controls'
111
120
  ]
191
  ]
112
121
});
192
});
113
122
193
114
=== modified file 'test/test_browser_app.js'
115
--- test/test_browser_app.js	2013-08-19 17:15:16 +0000
116
+++ test/test_browser_app.js	2013-08-21 14:26:55 +0000
117
@@ -33,6 +33,72 @@
118
33
  };
33
  };
119
34
34
120
35
  (function() {
35
  (function() {
121
36
    describe('browser minimized view', function() {
122
37
      var browser, container, Minimized, view, views, Y;
123
38
124
39
      before(function(done) {
125
40
        Y = YUI(GlobalConfig).use(
126
41
            'juju-views',
127
42
            'juju-browser',
128
43
            'juju-tests-utils',
129
44
            'subapp-browser-minimized', function(Y) {
130
45
              browser = Y.namespace('juju.browser');
131
46
              views = Y.namespace('juju.browser.views');
132
47
              Minimized = views.MinimizedView;
133
48
              done();
134
49
            });
135
50
      });
136
51
137
52
      beforeEach(function() {
138
53
        container = Y.namespace('juju-tests.utils').makeContainer('container');
139
54
        addBrowserContainer(Y, container);
140
55
        // Mock out a dummy location for the Store used in view instances.
141
56
        window.juju_config = {
142
57
          charmworldURL: 'http://localhost'
143
58
        };
144
59
145
60
      });
146
61
147
62
      afterEach(function() {
148
63
        view.destroy();
149
64
        Y.one('#subapp-browser').remove(true);
150
65
        delete window.juju_config;
151
66
        container.remove(true);
152
67
      });
153
68
154
69
      it('can route to fullscreen', function(done) {
155
70
        view = new Minimized();
156
71
        view.render();
157
72
        view.on('viewNavigate', function(ev) {
158
73
          assert.equal(ev.change.viewmode, 'fullscreen');
159
74
          done();
160
75
        });
161
76
        view.controls._goFullscreen({halt: function() {} });
162
77
      });
163
78
164
79
      it('can route to sidebar via view controls', function(done) {
165
80
        view = new Minimized();
166
81
        view.render();
167
82
        view.on('viewNavigate', function(ev) {
168
83
          assert.equal(ev.change.viewmode, 'sidebar');
169
84
          done();
170
85
        });
171
86
        view.controls._goSidebar({halt: function() {} });
172
87
      });
173
88
174
89
      it('can toggle back to oldviewmode via the toggle', function(done) {
175
90
        view = new Minimized({oldViewmode: 'sidebar'});
176
91
        view.render();
177
92
        view.on('viewNavigate', function(ev) {
178
93
          assert.equal(ev.change.viewmode, 'sidebar');
179
94
          done();
180
95
        });
181
96
        view.controls._toggleViewable({halt: function() {} });
182
97
      });
183
98
    });
184
99
  })();
185
100
186
101
  (function() {
187
36
    describe('browser fullscreen view', function() {
102
    describe('browser fullscreen view', function() {
188
37
      var browser, container, FullScreen, view, views, Y;
103
      var browser, container, FullScreen, view, views, Y;
189
38
104
Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2013-08-20	Pending
Review via email: mp+181151@code.launchpad.net