This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s = { | |
"蓝": { | |
singleName: "天空蓝", | |
percent: "20.03", | |
peoplecount: 5, | |
otherPeople: "蓝", | |
otherPeopleText: "外在蓝色的人拥有大局观和战略思维!\n你向外界舒适地展示着自我,在规则世界中自在穿行!\n蓝色的人聪明有灵气,总能轻易得到大家的欣赏和支持!", | |
infact: "蓝", | |
infactText: "极端的蓝色,是非常少见的组合!\n你最强大的力量在于感知,洞察和直觉!\n蓝色以其深邃灵魂和智慧,带给自己和他人幸运和奇迹!", | |
oneWord: "魅力超凡的艺术家", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s = { | |
"蓝": { | |
singleName: "天空蓝", | |
percent: "20.03", | |
peoplecount: 5, | |
otherPeople: "蓝", | |
otherPeopleText: "外在蓝色的人拥有大局观和战略思维!\n你向外界舒适地展示着自我,在规则世界中自在穿行!\n蓝色的人聪明有灵气,总能轻易得到大家的欣赏和支持!", | |
infact: "蓝", | |
infactText: "极端的蓝色,是非常少见的组合!\n你最强大的力量在于感知,洞察和直觉!\n蓝色以其深邃灵魂和智慧,带给自己和他人幸运和奇迹!", | |
oneWord: "魅力超凡的艺术家", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s = { | |
"蓝": { | |
singleName: "天空蓝", | |
percent: "20.03", | |
peoplecount: 5, | |
otherPeople: "蓝", | |
otherPeopleText: "外在蓝色的人拥有大局观和战略思维!\n你向外界舒适地展示着自我,在规则世界中自在穿行!\n蓝色的人聪明有灵气,总能轻易得到大家的欣赏和支持!", | |
infact: "蓝", | |
infactText: "极端的蓝色,是非常少见的组合!\n你最强大的力量在于感知,洞察和直觉!\n蓝色以其深邃灵魂和智慧,带给自己和他人幸运和奇迹!", | |
oneWord: "魅力超凡的艺术家", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/** | |
* @param {string} s | |
* @return {string} | |
*/ | |
var longestPalindrome = function(s) { | |
var i = 0, j = 0; | |
var longest = ""; | |
for(i = 0; i < s.length; i++) { | |
var oddPalin = checkPalin(s, i, i); | |
var evenPalin = checkPalin(s, i, i + 1); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/*************************************************/ | |
// 1.When elements < 24px, say height is 16px: | |
highlightHeight = targetRect.height; // got 16 | |
// … | |
let highlightHeightWithMin = Math.max(highlightHeight, parseFloat(highlightStyle.minHeight)); // got max(16, 24) = 24 | |
// … | |
let offsetY = -(Math.max(0, highlightHeightWithMin - targetRect.height) / 2); // (24 - 16) > 0, so the max() is not needed. | |
/*************************************************/ | |
// 2.When elements >= 24px, ex. height = 32px; | |
highlightHeight = targetRect.height; // 32px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/*************************************************/ | |
// 1.When elements < 24px, say height is 16px: | |
highlightHeight = targetRect.height; // got 16 | |
// … | |
let highlightHeightWithMin = Math.max(highlightHeight, parseFloat(highlightStyle.minHeight)); // got max(16, 24) = 24 | |
// … | |
let offsetY = -(Math.max(0, highlightHeightWithMin - targetRect.height) / 2); // (24 - 16) > 0, so the max() is not needed. | |
/*************************************************/ | |
// 2.When elements >= 24px, ex. height = 32px; | |
highlightHeight = targetRect.height; // 32px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css | |
index 7046a02..6a19c74 100644 | |
--- a/browser/extensions/onboarding/content/onboarding.css | |
+++ b/browser/extensions/onboarding/content/onboarding.css | |
@@ -86,3 +86,8 @@ | |
grid-row: footer-start; | |
grid-column: dialog-start / tour-end; | |
} | |
+ | |
+.onboarding-tour-page-section > iframe { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/extensions/mortar/host/common/ppapi-runtime.jsm b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
index 6dd14a4..9d0f1fe 100644 | |
--- a/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
+++ b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
@@ -1701,6 +1701,15 @@ class PPAPIInstance { | |
case 'setHash': | |
this.mm.sendAsyncMessage("ppapipdf.js:setHash", message.hash); | |
break; | |
+ case 'navigate': | |
+ dump("AAAAAAAAAAAAAAAAAA") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/extensions/mortar/host/common/ppapi-runtime.jsm b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
index d680fe0..f59c6e3 100644 | |
--- a/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
+++ b/browser/extensions/mortar/host/common/ppapi-runtime.jsm | |
@@ -11,6 +11,7 @@ const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components; | |
Cu.import("resource://gre/modules/ctypes.jsm"); | |
Cu.import("resource://gre/modules/Services.jsm"); | |
Cu.import("resource://ppapi.js/opengles2-utils.jsm"); | |
+Cu.importGlobalProperties(['URL']); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/components/downloads/content/indicator.js b/browser/components/downloads/content/indicator.js | |
index 4c22a6e..3fc3176 100644 | |
--- a/browser/components/downloads/content/indicator.js | |
+++ b/browser/components/downloads/content/indicator.js | |
@@ -284,6 +284,8 @@ const DownloadsIndicatorView = { | |
*/ | |
_notificationTimeout: null, | |
+ _anchorNotificationTimeout: null, | |
+ |
NewerOlder