isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Port non-GObject classes to JS6 classes

Browse Source 
ES6 finally adds standard class syntax to the language, so we can
replace our custom Lang.Class framework with the new syntax. Any
classes that inherit from GObject will need special treatment,
so limit the port to regular javascript classes for now.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/361
This commit is contained in:
Florian Müllner
2017-10-31 02:19:44 +01:00
committed by Georges Basile Stavracas Neto
parent 99ce3deeb0
commit bacfdbbb03
102 changed files with 3454 additions and 4183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
js/ui/viewSelector.js
View File

@ -53,12 +53,10 @@ function getTermsForSearchString(searchString) {
return terms;
}
var TouchpadShowOverviewAction = new Lang.Class({
Name: 'TouchpadShowOverviewAction',
_init(actor) {
var TouchpadShowOverviewAction = class {
constructor(actor) {
actor.connect('captured-event', this._handleEvent.bind(this));
},
}
_handleEvent(actor, event) {
if (event.type() != Clutter.EventType.TOUCHPAD_PINCH)
@ -72,7 +70,7 @@ var TouchpadShowOverviewAction = new Lang.Class({
return Clutter.EVENT_STOP;
}
});
};
Signals.addSignalMethods(TouchpadShowOverviewAction.prototype);
var ShowOverviewAction = new Lang.Class({
@ -138,10 +136,8 @@ var ShowOverviewAction = new Lang.Class({
}
});
var ViewSelector = new Lang.Class({
Name: 'ViewSelector',
_init(searchEntry, showAppsButton) {
var ViewSelector = class {
constructor(searchEntry, showAppsButton) {
this.actor = new Shell.Stack({ name: 'viewSelector' });
this._showAppsButton = showAppsButton;
@ -263,22 +259,22 @@ var ViewSelector = new Lang.Class({
gesture = new TouchpadShowOverviewAction(global.stage);
gesture.connect('activated', this._pinchGestureActivated.bind(this));
},
}
_pinchGestureActivated(action, scale) {
if (scale < PINCH_GESTURE_THRESHOLD)
Main.overview.show();
},
}
_toggleAppsPage() {
this._showAppsButton.checked = !this._showAppsButton.checked;
Main.overview.show();
},
}
showApps() {
this._showAppsButton.checked = true;
Main.overview.show();
},
}
show() {
this.reset();
@ -291,7 +287,7 @@ var ViewSelector = new Lang.Class({
if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
Main.overview.fadeOutDesktop();
},
}
animateFromOverview() {
// Make sure workspace page is fully visible to allow
@ -304,16 +300,16 @@ var ViewSelector = new Lang.Class({
if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
Main.overview.fadeInDesktop();
},
}
setWorkspacesFullGeometry(geom) {
this._workspacesDisplay.setWorkspacesFullGeometry(geom);
},
}
hide() {
this.reset();
this._workspacesDisplay.hide();
},
}
_addPage(actor, name, a11yIcon, params) {
params = Params.parse(params, { a11yFocus: null });
@ -335,7 +331,7 @@ var ViewSelector = new Lang.Class({
page.hide();
this.actor.add_actor(page);
return page;
},
}
_fadePageIn() {
Tweener.addTween(this._activePage,
@ -343,7 +339,7 @@ var ViewSelector = new Lang.Class({
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
transition: 'easeOutQuad'
});
},
}
_fadePageOut(page) {
let oldPage = page;
@ -355,7 +351,7 @@ var ViewSelector = new Lang.Class({
this._animateIn(oldPage);
}
});
},
}
_animateIn(oldPage) {
if (oldPage)
@ -372,7 +368,7 @@ var ViewSelector = new Lang.Class({
} else {
this._fadePageIn();
}
},
}
_animateOut(page) {
let oldPage = page;
@ -385,7 +381,7 @@ var ViewSelector = new Lang.Class({
} else {
this._fadePageOut(page);
}
},
}
_showPage(page) {
if (!Main.overview.visible)
@ -402,17 +398,17 @@ var ViewSelector = new Lang.Class({
this._animateOut(oldPage)
else
this._animateIn();
},
}
_a11yFocusPage(page) {
this._showAppsButton.checked = page == this._appsPage;
page.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
},
}
_onShowAppsButtonToggled() {
this._showPage(this._showAppsButton.checked ?
this._appsPage : this._workspacesPage);
},
}
_onStageKeyPress(actor, event) {
// Ignore events while anything but the overview has
@ -443,7 +439,7 @@ var ViewSelector = new Lang.Class({
}
}
return Clutter.EVENT_PROPAGATE;
},
}
_searchCancelled() {
this._showPage(this._showAppsButton.checked ? this._appsPage
@ -457,7 +453,7 @@ var ViewSelector = new Lang.Class({
// (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
if (this._text.text != '')
this.reset();
},
}
reset() {
// Don't drop the key focus on Clutter's side if anything but the
@ -470,7 +466,7 @@ var ViewSelector = new Lang.Class({
this._text.set_cursor_visible(true);
this._text.set_selection(0, 0);
},
}
_onStageKeyFocusChanged() {
let focus = global.stage.get_key_focus();
@ -483,7 +479,7 @@ var ViewSelector = new Lang.Class({
this._entry.add_style_pseudo_class('focus');
else
this._entry.remove_style_pseudo_class('focus');
},
}
_onMapped() {
if (this._entry.mapped) {
@ -498,7 +494,7 @@ var ViewSelector = new Lang.Class({
global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0;
}
},
}
_shouldTriggerSearch(symbol) {
if (symbol == Clutter.Multi_key)
@ -515,7 +511,7 @@ var ViewSelector = new Lang.Class({
return true;
return false;
},
}
startSearch(event) {
global.stage.set_key_focus(this._text);
@ -523,12 +519,12 @@ var ViewSelector = new Lang.Class({
let synthEvent = event.copy();
synthEvent.set_source(this._text);
this._text.event(synthEvent, false);
},
}
// the entry does not show the hint
_isActivated() {
return this._text.text == this._entry.get_text();
},
}
_onTextChanged(se, prop) {
let terms = getTermsForSearchString(this._entry.get_text());
@ -553,7 +549,7 @@ var ViewSelector = new Lang.Class({
this._entry.set_secondary_icon(null);
this._searchCancelled();
}
},
}
_onKeyPress(entry, event) {
let symbol = event.get_key_symbol();
@ -592,7 +588,7 @@ var ViewSelector = new Lang.Class({
}
}
return Clutter.EVENT_PROPAGATE;
},
}
_onCapturedEvent(actor, event) {
if (event.type() == Clutter.EventType.BUTTON_PRESS) {
@ -609,7 +605,7 @@ var ViewSelector = new Lang.Class({
}
return Clutter.EVENT_PROPAGATE;
},
}
getActivePage() {
if (this._activePage == this._workspacesPage)
@ -618,7 +614,7 @@ var ViewSelector = new Lang.Class({
return ViewPage.APPS;
else
return ViewPage.SEARCH;
},
}
fadeIn() {
let actor = this._activePage;
@ -626,7 +622,7 @@ var ViewSelector = new Lang.Class({
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
transition: 'easeInQuad'
});
},
}
fadeHalf() {
let actor = this._activePage;
@ -635,5 +631,5 @@ var ViewSelector = new Lang.Class({
transition: 'easeOutQuad'
});
}
});
};
Signals.addSignalMethods(ViewSelector.prototype);