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));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Signals.addSignalMethods(DocManager.prototype);
|
||||
|
@ -22,7 +22,7 @@ function nameToPath(name) {
|
||||
|
||||
function pathToName(path) {
|
||||
if (path[0] != '/')
|
||||
throw new Error('not a D-Bus path: ' + path);
|
||||
throw new Error('not a D-Bus path: ' + path);
|
||||
return path.substr(1).replace('/', '.', 'g');
|
||||
};
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||
|
||||
const GLib = imports.gi.GLib;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
const GConf = imports.gi.GConf;
|
||||
|
@ -4,34 +4,34 @@ dist_jsui_DATA = \
|
||||
altTab.js \
|
||||
appDisplay.js \
|
||||
appFavorites.js \
|
||||
boxpointer.js \
|
||||
boxpointer.js \
|
||||
calendar.js \
|
||||
chrome.js \
|
||||
dash.js \
|
||||
dnd.js \
|
||||
docDisplay.js \
|
||||
environment.js \
|
||||
extensionSystem.js \
|
||||
extensionSystem.js \
|
||||
genericDisplay.js \
|
||||
lightbox.js \
|
||||
link.js \
|
||||
lookingGlass.js \
|
||||
main.js \
|
||||
magnifier.js \
|
||||
magnifierDBus.js \
|
||||
main.js \
|
||||
messageTray.js \
|
||||
notificationDaemon.js \
|
||||
overview.js \
|
||||
panel.js \
|
||||
placeDisplay.js \
|
||||
runDialog.js \
|
||||
search.js \
|
||||
search.js \
|
||||
shellDBus.js \
|
||||
statusMenu.js \
|
||||
telepathyClient.js \
|
||||
tweener.js \
|
||||
windowAttentionHandler.js \
|
||||
windowAttentionHandler.js \
|
||||
windowManager.js \
|
||||
workspacesView.js \
|
||||
workspaceSwitcherPopup.js \
|
||||
workspaceSwitcherPopup.js \
|
||||
workspace.js
|
||||
|
@ -1,7 +1,8 @@
|
||||
const Lang = imports.lang;
|
||||
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||
|
||||
const Cairo = imports.cairo;
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const Lang = imports.lang;
|
||||
const St = imports.gi.St;
|
||||
const Shell = imports.gi.Shell;
|
||||
|
||||
@ -77,7 +78,7 @@ BoxPointer.prototype = {
|
||||
let availWidth = box.x2 - box.x1;
|
||||
let availHeight = box.y2 - box.y1;
|
||||
|
||||
childBox.x1 = 0
|
||||
childBox.x1 = 0;
|
||||
childBox.y1 = 0;
|
||||
childBox.x2 = availWidth;
|
||||
childBox.y2 = availHeight;
|
||||
@ -160,4 +161,4 @@ BoxPointer.prototype = {
|
||||
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 Gtk = imports.gi.Gtk;
|
||||
|
@ -173,7 +173,7 @@ ObjLink.prototype = {
|
||||
_onClicked: function (link) {
|
||||
Main.lookingGlass.inspectObject(this._obj, this.actor);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function Result(command, o, index) {
|
||||
this._init(command, o, index);
|
||||
|
@ -588,7 +588,7 @@ Magnifier.prototype = {
|
||||
let gConf = Shell.GConf.get_default();
|
||||
this.setCrosshairsClip(gConf.get_boolean(CROSS_HAIRS_CLIP_KEY));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function ZoomRegion(magnifier, mouseRoot) {
|
||||
this._init(magnifier, mouseRoot);
|
||||
@ -1200,7 +1200,7 @@ ZoomRegion.prototype = {
|
||||
this._crosshairsActor.set_position(x - groupWidth / 2, y - groupHeight / 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function Crosshairs() {
|
||||
this._init();
|
||||
@ -1476,4 +1476,4 @@ Crosshairs.prototype = {
|
||||
this._vertTopHair.set_position((groupWidth - thickness) / 2, top);
|
||||
this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -280,7 +280,7 @@ ShellMagnifier.prototype = {
|
||||
// Drop the leading '#'.
|
||||
return parseInt(colorString.slice(1), 16);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* ShellMagnifierZoomRegion:
|
||||
@ -369,7 +369,7 @@ ShellMagnifierZoomRegion.prototype = {
|
||||
let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2], height: viewPort[3] };
|
||||
this._zoomRegion.setViewPort(viewRect);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
DBus.conformExport(ShellMagnifier.prototype, MagnifierIface);
|
||||
DBus.conformExport(ShellMagnifierZoomRegion.prototype, ZoomRegionIface);
|
||||
|
@ -184,7 +184,7 @@ PanelMenuItem.prototype = {
|
||||
|
||||
this.label = new St.Label({ text: text });
|
||||
this.actor.set_child(this.label);
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
function PanelSeparatorMenuItem() {
|
||||
@ -209,9 +209,9 @@ PanelSeparatorMenuItem.prototype = {
|
||||
let found, margin, gradientHeight;
|
||||
[found, margin] = themeNode.get_length('-margin-horizontal', 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);
|
||||
let endColor = new Clutter.Color()
|
||||
let endColor = new Clutter.Color();
|
||||
themeNode.get_color('-gradient-end', false, endColor);
|
||||
|
||||
let gradientWidth = (width - margin * 2);
|
||||
@ -1112,12 +1112,12 @@ Panel.prototype = {
|
||||
break;
|
||||
case '24-hour':
|
||||
if (showDate)
|
||||
/* Translators: This is the time format with date used
|
||||
/* Translators: This is the time format with date used
|
||||
in 24-hour mode. */
|
||||
clockFormat = showSeconds ? _("%a %b %e, %R:%S")
|
||||
: _("%a %b %e, %R");
|
||||
else
|
||||
/* Translators: This is the time format without date used
|
||||
/* Translators: This is the time format without date used
|
||||
in 24-hour mode. */
|
||||
clockFormat = showSeconds ? _("%a %R:%S")
|
||||
: _("%a %R");
|
||||
@ -1125,12 +1125,12 @@ Panel.prototype = {
|
||||
case '12-hour':
|
||||
default:
|
||||
if (showDate)
|
||||
/* Translators: This is a time format with date used
|
||||
/* Translators: This is a time format with date used
|
||||
for AM/PM. */
|
||||
clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
|
||||
: _("%a %b %e, %l:%M %p");
|
||||
else
|
||||
/* Translators: This is a time format without date used
|
||||
/* Translators: This is a time format without date used
|
||||
for AM/PM. */
|
||||
clockFormat = showSeconds ? _("%a %l:%M:%S %p")
|
||||
: _("%a %l:%M %p");
|
||||
|
@ -633,11 +633,11 @@ SingleView.prototype = {
|
||||
this._leftShadow = new St.Bin({ style_class: 'left-workspaces-shadow',
|
||||
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
||||
height: global.screen_height,
|
||||
x: global.screen_width })
|
||||
x: global.screen_width });
|
||||
this._rightShadow = new St.Bin({ style_class: 'right-workspaces-shadow',
|
||||
width: Math.ceil(global.screen_width * WORKSPACE_SHADOW_SCALE),
|
||||
height: global.screen_height,
|
||||
x: global.screen_width })
|
||||
x: global.screen_width });
|
||||
|
||||
GenericWorkspacesView.prototype._init.call(this, width, height, x, y, workspaces);
|
||||
|
||||
@ -1071,7 +1071,7 @@ SingleView.prototype = {
|
||||
},
|
||||
|
||||
updateWorkspaces: function(oldNumWorkspaces, newNumWorkspaces, lostWorkspaces) {
|
||||
let active = global.screen.get_active_workspace_index();
|
||||
let active = global.screen.get_active_workspace_index();
|
||||
|
||||
for (let l = 0; l < lostWorkspaces.length; l++)
|
||||
lostWorkspaces[l].disconnectAll();
|
||||
@ -1545,7 +1545,7 @@ WorkspacesControls.prototype = {
|
||||
},
|
||||
|
||||
_workspacesChanged: function() {
|
||||
let showToggleButton = (global.screen.n_workspaces > 1)
|
||||
let showToggleButton = (global.screen.n_workspaces > 1);
|
||||
Tweener.addTween(this._toggleViewButton,
|
||||
{ opacity: showToggleButton ? 255 : 0,
|
||||
time: WORKSPACE_SWITCH_TIME,
|
||||
|
Loading…
Reference in New Issue
Block a user