minor js cleanups
add missing semicolons pointed out by js2-mode, add missing emacs modelines, fix a few tabs that crept in via cut+paste
This commit is contained in:
parent
9b3e16595b
commit
8b242dd4bd
@ -148,6 +148,6 @@ DocManager.prototype = {
|
|||||||
}
|
}
|
||||||
return multipleMatches.concat(prefixMatches.concat(substringMatches));
|
return multipleMatches.concat(prefixMatches.concat(substringMatches));
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
Signals.addSignalMethods(DocManager.prototype);
|
Signals.addSignalMethods(DocManager.prototype);
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||||
|
|
||||||
const GLib = imports.gi.GLib;
|
const GLib = imports.gi.GLib;
|
||||||
const Gtk = imports.gi.Gtk;
|
const Gtk = imports.gi.Gtk;
|
||||||
const GConf = imports.gi.GConf;
|
const GConf = imports.gi.GConf;
|
||||||
|
@ -16,9 +16,9 @@ dist_jsui_DATA = \
|
|||||||
lightbox.js \
|
lightbox.js \
|
||||||
link.js \
|
link.js \
|
||||||
lookingGlass.js \
|
lookingGlass.js \
|
||||||
main.js \
|
|
||||||
magnifier.js \
|
magnifier.js \
|
||||||
magnifierDBus.js \
|
magnifierDBus.js \
|
||||||
|
main.js \
|
||||||
messageTray.js \
|
messageTray.js \
|
||||||
notificationDaemon.js \
|
notificationDaemon.js \
|
||||||
overview.js \
|
overview.js \
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
const Lang = imports.lang;
|
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||||
|
|
||||||
const Cairo = imports.cairo;
|
const Cairo = imports.cairo;
|
||||||
const Clutter = imports.gi.Clutter;
|
const Clutter = imports.gi.Clutter;
|
||||||
|
const Lang = imports.lang;
|
||||||
const St = imports.gi.St;
|
const St = imports.gi.St;
|
||||||
const Shell = imports.gi.Shell;
|
const Shell = imports.gi.Shell;
|
||||||
|
|
||||||
@ -77,7 +78,7 @@ BoxPointer.prototype = {
|
|||||||
let availWidth = box.x2 - box.x1;
|
let availWidth = box.x2 - box.x1;
|
||||||
let availHeight = box.y2 - box.y1;
|
let availHeight = box.y2 - box.y1;
|
||||||
|
|
||||||
childBox.x1 = 0
|
childBox.x1 = 0;
|
||||||
childBox.y1 = 0;
|
childBox.y1 = 0;
|
||||||
childBox.x2 = availWidth;
|
childBox.x2 = availWidth;
|
||||||
childBox.y2 = availHeight;
|
childBox.y2 = availHeight;
|
||||||
@ -160,4 +161,4 @@ BoxPointer.prototype = {
|
|||||||
this._border.queue_repaint();
|
this._border.queue_repaint();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* -*- mode: js2; js2-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
|
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||||
|
|
||||||
const Clutter = imports.gi.Clutter;
|
const Clutter = imports.gi.Clutter;
|
||||||
const Gtk = imports.gi.Gtk;
|
const Gtk = imports.gi.Gtk;
|
||||||
|
@ -173,7 +173,7 @@ ObjLink.prototype = {
|
|||||||
_onClicked: function (link) {
|
_onClicked: function (link) {
|
||||||
Main.lookingGlass.inspectObject(this._obj, this.actor);
|
Main.lookingGlass.inspectObject(this._obj, this.actor);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
function Result(command, o, index) {
|
function Result(command, o, index) {
|
||||||
this._init(command, o, index);
|
this._init(command, o, index);
|
||||||
|
@ -588,7 +588,7 @@ Magnifier.prototype = {
|
|||||||
let gConf = Shell.GConf.get_default();
|
let gConf = Shell.GConf.get_default();
|
||||||
this.setCrosshairsClip(gConf.get_boolean(CROSS_HAIRS_CLIP_KEY));
|
this.setCrosshairsClip(gConf.get_boolean(CROSS_HAIRS_CLIP_KEY));
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
function ZoomRegion(magnifier, mouseRoot) {
|
function ZoomRegion(magnifier, mouseRoot) {
|
||||||
this._init(magnifier, mouseRoot);
|
this._init(magnifier, mouseRoot);
|
||||||
@ -1200,7 +1200,7 @@ ZoomRegion.prototype = {
|
|||||||
this._crosshairsActor.set_position(x - groupWidth / 2, y - groupHeight / 2);
|
this._crosshairsActor.set_position(x - groupWidth / 2, y - groupHeight / 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
function Crosshairs() {
|
function Crosshairs() {
|
||||||
this._init();
|
this._init();
|
||||||
@ -1476,4 +1476,4 @@ Crosshairs.prototype = {
|
|||||||
this._vertTopHair.set_position((groupWidth - thickness) / 2, top);
|
this._vertTopHair.set_position((groupWidth - thickness) / 2, top);
|
||||||
this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
|
this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
@ -280,7 +280,7 @@ ShellMagnifier.prototype = {
|
|||||||
// Drop the leading '#'.
|
// Drop the leading '#'.
|
||||||
return parseInt(colorString.slice(1), 16);
|
return parseInt(colorString.slice(1), 16);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ShellMagnifierZoomRegion:
|
* ShellMagnifierZoomRegion:
|
||||||
@ -369,7 +369,7 @@ ShellMagnifierZoomRegion.prototype = {
|
|||||||
let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2], height: viewPort[3] };
|
let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2], height: viewPort[3] };
|
||||||
this._zoomRegion.setViewPort(viewRect);
|
this._zoomRegion.setViewPort(viewRect);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
DBus.conformExport(ShellMagnifier.prototype, MagnifierIface);
|
DBus.conformExport(ShellMagnifier.prototype, MagnifierIface);
|
||||||
DBus.conformExport(ShellMagnifierZoomRegion.prototype, ZoomRegionIface);
|
DBus.conformExport(ShellMagnifierZoomRegion.prototype, ZoomRegionIface);
|
||||||
|
@ -184,7 +184,7 @@ PanelMenuItem.prototype = {
|
|||||||
|
|
||||||
this.label = new St.Label({ text: text });
|
this.label = new St.Label({ text: text });
|
||||||
this.actor.set_child(this.label);
|
this.actor.set_child(this.label);
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function PanelSeparatorMenuItem() {
|
function PanelSeparatorMenuItem() {
|
||||||
@ -209,9 +209,9 @@ PanelSeparatorMenuItem.prototype = {
|
|||||||
let found, margin, gradientHeight;
|
let found, margin, gradientHeight;
|
||||||
[found, margin] = themeNode.get_length('-margin-horizontal', false);
|
[found, margin] = themeNode.get_length('-margin-horizontal', false);
|
||||||
[found, gradientHeight] = themeNode.get_length('-gradient-height', false);
|
[found, gradientHeight] = themeNode.get_length('-gradient-height', false);
|
||||||
let startColor = new Clutter.Color()
|
let startColor = new Clutter.Color();
|
||||||
themeNode.get_color('-gradient-start', false, startColor);
|
themeNode.get_color('-gradient-start', false, startColor);
|
||||||
let endColor = new Clutter.Color()
|
let endColor = new Clutter.Color();
|
||||||
themeNode.get_color('-gradient-end', false, endColor);
|
themeNode.get_color('-gradient-end', false, endColor);
|
||||||
|
|
||||||
let gradientWidth = (width - margin * 2);
|
let gradientWidth = (width - margin * 2);
|
||||||
|
@ -633,11 +633,11 @@ SingleView.prototype = {
|
|||||||
this._leftShadow = new St.Bin({ style_class: 'left-workspaces-shadow',
|
this._leftShadow = new St.Bin({ style_class: 'left-workspaces-shadow',
|
||||||
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
||||||
height: global.screen_height,
|
height: global.screen_height,
|
||||||
x: global.screen_width })
|
x: global.screen_width });
|
||||||
this._rightShadow = new St.Bin({ style_class: 'right-workspaces-shadow',
|
this._rightShadow = new St.Bin({ style_class: 'right-workspaces-shadow',
|
||||||
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
||||||
height: global.screen_height,
|
height: global.screen_height,
|
||||||
x: global.screen_width })
|
x: global.screen_width });
|
||||||
|
|
||||||
GenericWorkspacesView.prototype._init.call(this, width, height, x, y, workspaces);
|
GenericWorkspacesView.prototype._init.call(this, width, height, x, y, workspaces);
|
||||||
|
|
||||||
@ -1545,7 +1545,7 @@ WorkspacesControls.prototype = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
_workspacesChanged: function() {
|
_workspacesChanged: function() {
|
||||||
let showToggleButton = (global.screen.n_workspaces > 1)
|
let showToggleButton = (global.screen.n_workspaces > 1);
|
||||||
Tweener.addTween(this._toggleViewButton,
|
Tweener.addTween(this._toggleViewButton,
|
||||||
{ opacity: showToggleButton ? 255 : 0,
|
{ opacity: showToggleButton ? 255 : 0,
|
||||||
time: WORKSPACE_SWITCH_TIME,
|
time: WORKSPACE_SWITCH_TIME,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user