Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2204)

Delta Between Two Patch Sets: app/app.js

Issue 10048043: Pan to services on delta.
Left Patch Set: Created 11 years, 9 months ago
Right Patch Set: Pan to services on delta. Created 11 years, 9 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « [revision details] ('k') | app/views/topology/importexport.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 This file is part of the Juju GUI, which lets users view and manage Juju 2 This file is part of the Juju GUI, which lets users view and manage Juju
3 environments within a graphical interface (https://launchpad.net/juju-gui). 3 environments within a graphical interface (https://launchpad.net/juju-gui).
4 Copyright (C) 2012-2013 Canonical Ltd. 4 Copyright (C) 2012-2013 Canonical Ltd.
5 5
6 This program is free software: you can redistribute it and/or modify it under 6 This program is free software: you can redistribute it and/or modify it under
7 the terms of the GNU Affero General Public License version 3, as published by 7 the terms of the GNU Affero General Public License version 3, as published by
8 the Free Software Foundation. 8 the Free Software Foundation.
9 9
10 This program is distributed in the hope that it will be useful, but WITHOUT 10 This program is distributed in the hope that it will be useful, but WITHOUT
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 * 45 *
46 * @class App 46 * @class App
47 */ 47 */
48 var JujuGUI = Y.Base.create('juju-gui', Y.App, [ 48 var JujuGUI = Y.Base.create('juju-gui', Y.App, [
49 Y.juju.SubAppRegistration, 49 Y.juju.SubAppRegistration,
50 Y.juju.NSRouter], { 50 Y.juju.NSRouter], {
51 51
52 /* 52 /*
53 Extension properties 53 Extension properties
54 */ 54 */
55 subApplications: [], 55 subApplications: [{
56 type: Y.juju.subapps.Browser,
57 config: {}
58 }],
56 59
57 defaultNamespace: 'charmstore', 60 defaultNamespace: 'charmstore',
58 /* 61 /*
59 End extension properties 62 End extension properties
60 */ 63 */
61 64
62 /** 65 /**
63 * Views 66 * Views
64 * 67 *
65 * The views encapsulate the functionality blocks that output 68 * The views encapsulate the functionality blocks that output
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 type: 'juju.views.NotificationsView', 128 type: 'juju.views.NotificationsView',
126 preserve: true 129 preserve: true
127 }, 130 },
128 131
129 notifications_overview: { 132 notifications_overview: {
130 type: 'juju.views.NotificationsOverview' 133 type: 'juju.views.NotificationsOverview'
131 } 134 }
132 135
133 }, 136 },
134 137
135 /** 138 /*
136 * Declarative keybindings on the window object. 139 * Declarative keybindings on the window object.
137 * 140 *
138 * Prefix supported are: 141 * Prefix supported are:
139 * C - Control 142 * C - Control
140 * A - Alt 143 * A - Alt
141 * S - Shift 144 * S - Shift
142 * 145 *
143 * Followed by a lowercase letter. For example 146 * Followed by a lowercase letter. For example
144 * 147 *
145 * A-s is the 'Alt + s' keybinding. 148 * A-s is the 'Alt + s' keybinding.
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 352
350 // Concession to testing, they need muck with console, we cannot as well. 353 // Concession to testing, they need muck with console, we cannot as well.
351 if (window.mochaPhantomJS === undefined) { 354 if (window.mochaPhantomJS === undefined) {
352 if (consoleEnabled) { 355 if (consoleEnabled) {
353 consoleManager.native(); 356 consoleManager.native();
354 } else { 357 } else {
355 consoleManager.noop(); 358 consoleManager.noop();
356 } 359 }
357 } 360 }
358 361
359 // XXX: #1185002 the charm browser subapp feature flag needs to be
360 // removed
361 if (window.flags.browser_enabled) {
362 this.subApplications.push({
363 type: Y.juju.subapps.Browser,
364 config: {}
365 });
366 }
367 362
368 if (window.flags.websocket_capture) { 363 if (window.flags.websocket_capture) {
369 this.websocketLogging = new Y.juju.WebsocketLogging(); 364 this.websocketLogging = new Y.juju.WebsocketLogging();
370 } 365 }
371 366
372 this.renderEnvironment = true; 367 this.renderEnvironment = true;
373 // If this property has a value other than '/' then 368 // If this property has a value other than '/' then
374 // navigate to it after logging in. 369 // navigate to it after logging in.
375 this.redirectPath = '/'; 370 this.redirectPath = '/';
376 371
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 'app-subapp-extension', 1322 'app-subapp-extension',
1328 'sub-app', 1323 'sub-app',
1329 'subapp-browser', 1324 'subapp-browser',
1330 'event-key', 1325 'event-key',
1331 'event-touch', 1326 'event-touch',
1332 'model-controller', 1327 'model-controller',
1333 'FileSaver', 1328 'FileSaver',
1334 'juju-inspector-widget' 1329 'juju-inspector-widget'
1335 ] 1330 ]
1336 }); 1331 });
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b