mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 586685: All user-facing strings in JS are now localizable via stringbundle [r=dolske a=dolske]
NOT. Everything but user facing strings being localized. Random whitespace fixes. Random styling changes. Also has Bug 587158 - Update intro-video URL to CDN'ed version And string changes. And Bug 586814 - Unable to close Tab groups --HG-- extra : rebase_source : bc46adb3b3acc2e4daee067e9209d049fe1a8970
This commit is contained in:
parent
9a992624e0
commit
d4e1a50954
@ -108,8 +108,8 @@ Drag.prototype = {
|
||||
// proportionally or not
|
||||
// checkItemStatus - (boolean) make sure this is a valid item which should be snapped
|
||||
snapBounds: function Drag_snapBounds(bounds, stationaryCorner, assumeConstantSize, keepProportional, checkItemStatus) {
|
||||
if (!stationaryCorner)
|
||||
stationaryCorner || 'topleft';
|
||||
if (!stationaryCorner)
|
||||
stationaryCorner || 'topleft';
|
||||
var update = false; // need to update
|
||||
var updateX = false;
|
||||
var updateY = false;
|
||||
|
@ -126,15 +126,13 @@ let GroupItem = function GroupItem(listOfEls, options) {
|
||||
|
||||
// ___ New Tab Button
|
||||
this.$ntb = iQ("<div>")
|
||||
.appendTo($container);
|
||||
|
||||
this.$ntb
|
||||
.addClass('newTabButton')
|
||||
.click(function() {
|
||||
self.newTab();
|
||||
});
|
||||
|
||||
(this.$ntb)[0].title = 'New tab';
|
||||
})
|
||||
.attr('title',
|
||||
"New tab")
|
||||
.appendTo($container);
|
||||
|
||||
// ___ Resizer
|
||||
this.$resizer = iQ("<div>")
|
||||
@ -169,7 +167,7 @@ let GroupItem = function GroupItem(listOfEls, options) {
|
||||
this.$titleContainer = iQ('.title-container', this.$titlebar);
|
||||
this.$title = iQ('.name', this.$titlebar);
|
||||
this.$titleShield = iQ('.title-shield', this.$titlebar);
|
||||
this.setTitle(options.title || "");
|
||||
this.setTitle(options.title || this.defaultName);
|
||||
|
||||
var titleUnfocus = function() {
|
||||
self.$titleShield.show();
|
||||
@ -298,7 +296,7 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
|
||||
// ----------
|
||||
// Variable: defaultName
|
||||
// The prompt text for the title field.
|
||||
defaultName: "name this groupItem...",
|
||||
defaultName: "Name this tab group…",
|
||||
|
||||
// -----------
|
||||
// Function: setActiveTab
|
||||
@ -374,7 +372,7 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
|
||||
adjustTitleSize: function() {
|
||||
Utils.assert(this.bounds, 'bounds needs to have been set');
|
||||
let closeButton = iQ('.close', this.container);
|
||||
var w = Math.min(this.bounds.width - closeButton.width() - closeButton.css('right'),
|
||||
var w = Math.min(this.bounds.width - parseInt(closeButton.width()) - parseInt(closeButton.css('right')),
|
||||
Math.max(150, this.getTitle().length * 6));
|
||||
// The * 6 multiplier calculation is assuming that characters in the title
|
||||
// are approximately 6 pixels wide. Bug 586545
|
||||
@ -1800,8 +1798,9 @@ window.GroupItems = {
|
||||
// Function: killNewTabGroup
|
||||
// Removes the New Tab Group, which is now defunct. See bug 575851 and comments therein.
|
||||
killNewTabGroup: function() {
|
||||
let newTabGroupTitle = "New Tabs";
|
||||
this.groupItems.forEach(function(groupItem) {
|
||||
if (groupItem.getTitle() == 'New Tabs' && groupItem.locked.title) {
|
||||
if (groupItem.getTitle() == newTabGroupTitle && groupItem.locked.title) {
|
||||
groupItem.removeAll();
|
||||
groupItem.close();
|
||||
}
|
||||
|
@ -1048,7 +1048,7 @@ window.Items = {
|
||||
var bounds2 = pair2.bounds;
|
||||
if (bounds2.intersects(newBounds))
|
||||
blocked = true;
|
||||
return;
|
||||
return;
|
||||
});
|
||||
|
||||
if (!blocked) {
|
||||
|
@ -347,11 +347,11 @@ input.name {
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
input.name:hover {
|
||||
.title-container:hover input.name {
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
|
||||
input.name-locked:hover {
|
||||
.title-container:hover input.name-locked {
|
||||
border: 1px solid transparent !important;
|
||||
cursor: default;
|
||||
}
|
||||
@ -366,7 +366,7 @@ input.defaultName {
|
||||
color: transparent;
|
||||
}
|
||||
|
||||
input.defaultName:hover {
|
||||
.title-container:hover input.defaultName {
|
||||
color: #CCC;
|
||||
}
|
||||
|
||||
|
@ -184,11 +184,14 @@ var UIManager = {
|
||||
});
|
||||
|
||||
// ___ make info item
|
||||
let welcome = "How to organize your tabs";
|
||||
let more = "";
|
||||
let video = "http://videos-cdn.mozilla.net/firefox4beta/tabcandy_howto.webm";
|
||||
var html =
|
||||
"<div class='intro'>"
|
||||
+ "<h1>Welcome to Firefox Tab Sets</h1>" // TODO: This needs to be localized if it's kept in
|
||||
+ "<div>(more goes here)</div><br>"
|
||||
+ "<video src='http://people.mozilla.org/~araskin/movies/tabcandy_howto.webm' "
|
||||
+ "<h1>" + welcome + "</h1>"
|
||||
+ ( more && more.length ? "<div>" + more + "</div><br>" : "")
|
||||
+ "<video src='" + video + "' "
|
||||
+ "width='100%' preload controls>"
|
||||
+ "</div>";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user