Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 11 files changed
  • 0 commit comments
  • 1 contributor
View
2  chrome/manifest.json
@@ -1,6 +1,6 @@
{
"name": "Missing e",
- "version": "2.9.15",
+ "version": "2.9.16",
"description": "Useful features and customizations for Tumblr.",
"icons": { "16": "identity/missinge16.png",
"48": "identity/missinge48.png",
View
3  core/askTweaks/askTweaks.js
@@ -687,7 +687,8 @@ MissingE.packages.askTweaks = {
};
if (extension.isChrome ||
- extension.isFirefox) {
+ extension.isFirefox ||
+ extension.isOpera) {
if (window.top === window ||
MissingE.isTumblrURL(location.href, ["askForm", "fanMail"])) {
MissingE.packages.askTweaks.init();
View
2  firefox/missinge/package.json
@@ -3,7 +3,7 @@
"license": "GPL 3.0",
"author": "Jeremy Cutler",
"url": "http://missing-e.com",
- "version": "2.9.15",
+ "version": "2.9.16",
"fullName": "Missing e",
"id": "jid0-0PGffAcVvhUBieFYkRVVc5w6lIU",
"description": "Useful features and customizations for Tumblr.",
View
3  lib/facebox/facebox.css
@@ -41,10 +41,13 @@ top:5px;
right:5px;
padding:2px;
background:#fff;
+width:8px;
+height:8px;
}
#facebox .close img{
opacity:0.3;
+vertical-align:top;
}
#facebox .close:hover img{
View
4 missinge.safariextension/Info.plist
@@ -13,9 +13,9 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
- <string>2.9.15</string>
+ <string>2.9.16</string>
<key>CFBundleVersion</key>
- <string>29015</string>
+ <string>29016</string>
<key>Chrome</key>
<dict>
<key>Database Quota</key>
View
2  missinge.safariextension/Settings.plist
@@ -52,7 +52,7 @@
</dict>
<dict>
<key>DefaultValue</key>
- <string>2.9.15</string>
+ <string>2.9.16</string>
<key>Key</key>
<string>MissingE_version</string>
<key>Title</key>
View
106 opera/index.html
@@ -37,6 +37,7 @@
function getImages(imgs, callback) {
var i;
var result = {};
+ var canvasSet = {}, imgSet = {};
var imgCount = 0;
function onComplete(){
if (imgCount >= imgs.length) {
@@ -44,12 +45,14 @@
}
}
for (i=0; i<imgs.length; i++) {
- if (typeof imageCache[imgs[i]] === "undefined") {
- var canvas = document.createElement("canvas");
- var img = document.createElement("img");
- img.setAttribute("relSrc", imgs[i]);
- img.onload = function(){
- var source = img.getAttribute("relSrc");
+ if (!imageCache.hasOwnProperty(imgs[i])) {
+ canvasSet[imgs[i]] = document.createElement("canvas");
+ imgSet[imgs[i]] = document.createElement("img");
+ imgSet[imgs[i]].setAttribute("relSrc", imgs[i]);
+ imgSet[imgs[i]].onload = function(){
+ var source = this.getAttribute("relSrc");
+ var img = this;
+ var canvas = canvasSet[source];
canvas.height = img.height;
canvas.width = img.width;
var context = canvas.getContext("2d");
@@ -59,7 +62,7 @@
imgCount++;
onComplete();
};
- img.src = imgs[i];
+ imgSet[imgs[i]].src = imgs[i];
}
else {
result[imgs[i]] = imageCache[imgs[i]];
@@ -174,11 +177,12 @@
msg += "\n " + i + " = " + e.data[i];
}
}
- console.log(msg);
if (request.greeting == "settings") {
var settings = {};
+ settings.greeting = "settings";
settings.component = request.component;
+ settings.subcomponent = request.subcomponent;
switch(request.component) {
case "askTweaks":
settings.scroll = getSetting("MissingE_askTweaks_scroll",1);
@@ -190,7 +194,7 @@
}
settings.askDash = getSetting("MissingE_askTweaks_askDash",0);
settings.massDelete = getSetting("MissingE_askTweaks_massDelete",1);
- settings.adjustDomain = MissingE.isTumblrURL(sender.tab.url, ["messages"]);
+ settings.adjustDomain = MissingE.isTumblrURL(e.origin, ["messages"]);
settings.photoReplies = getSetting("MissingE_postingTweaks_enabled",1) == 1 ?
getSetting("MissingE_postingTweaks_photoReplies",1) : 0;
break;
@@ -277,7 +281,7 @@
settings.keyboardShortcut = getSetting("MissingE_betterReblogs_keyboardShortcut",1);
break;
}
- sendResponse(settings);
+ e.source.postMessage(settings);
}
else if (request.greeting == "update") {
e.source.postMessage({greeting: "update",
@@ -287,6 +291,7 @@
else if (request.greeting == "earlyStyles") {
var injectSlimSidebar = false;
var injectStyles = [];
+ var sendImages = [];
if (false && e.origin !== request.url &&
MissingE.isTumblrURL(request.url, ["upload"]) &&
@@ -305,18 +310,18 @@
return;
}
- if (false && getSetting("extensions.MissingE.askTweaks.enabled",1) == 1) {
- if (getSetting("extensions.MissingE.askTweaks.smallFanMail",0) == 1 &&
- MissingE.isTumblrURL(message.url, ["fanMail", "messages"])) {
+ if (getSetting("MissingE_askTweaks_enabled",1) == 1) {
+ if (getSetting("MissingE_askTweaks_smallFanMail",0) == 1 &&
+ MissingE.isTumblrURL(request.url, ["fanMail", "messages"])) {
injectStyles.push({file: "core/askTweaks/smallFanMail.css"});
}
- if (getSetting("extensions.MissingE.askTweaks.allFanMail",0) == 1 &&
- MissingE.isTumblrURL(message.url, ["messages"])) {
+ if (getSetting("MissingE_askTweaks_allFanMail",0) == 1 &&
+ MissingE.isTumblrURL(request.url, ["messages"])) {
injectStyles.push({file: "core/askTweaks/allFanMail.css"});
}
}
- if (false && MissingE.isTumblrURL(message.url,
+ if (MissingE.isTumblrURL(request.url,
["dashboard",
"blog",
"blogData",
@@ -325,7 +330,7 @@
"messages",
"likes",
"tagged"])) {
-
+/*
injectStyles.push({code:
'#posts .post .post_controls .MissingE_experimental_reply, ' +
'#posts .post .post_controls .MissingE_experimental_reply_wait, ' +
@@ -347,8 +352,8 @@
data.url("core/betterReblogs/reblogSuccess.png") +
'") !important; ' +
'}'});
-
- if (getSetting("extensions.MissingE.dashboardTweaks.enabled",1) == 1) {
+*/
+ if (false && getSetting("extensions.MissingE.dashboardTweaks.enabled",1) == 1) {
injectStyles.push({file: "core/dashboardTweaks/dashboardTweaks.css"});
if (getSetting("extensions.MissingE.dashboardTweaks.smallIcons",0) == 1) {
injectStyles.push({file: "core/dashboardTweaks/smallIcons.css"});
@@ -387,6 +392,7 @@
'}'});
injectStyles.push({file: "core/dashboardTweaks/replaceIcons.css"});
}
+
if (getSetting("extensions.MissingE.dashboardTweaks.textControls",0) == 1) {
injectStyles.push({file: "core/dashboardTweaks/textControls.css"});
}
@@ -410,7 +416,7 @@
if (getSetting("extensions.MissingE.dashboardTweaks.simpleHighlight",0) == 1)
injectStyles.push({file: "core/dashboardTweaks/simpleHighlight.css"});
}
-
+/*
if (getSetting("extensions.MissingE.safeDash.enabled",1) == 1) {
injectStyles.push({file: "core/safeDash/safeDash.css"});
if (getSetting("extensions.MissingE.safeDash.photosetAll",0) == 1) {
@@ -439,7 +445,7 @@
'");' +
'}'});
}
-
+*/
if (false &&getSetting("extensions.MissingE.bookmarker.enabled",1) == 1) {
injectStyles.push({file: "core/bookmarker/bookmarker.css"});
}
@@ -455,7 +461,7 @@
injectStyles.push({file: "core/magnifier/magnifier.css"});
}
- if (false&&getSetting("extensions.MissingE.askTweaks.enabled",1) == 1) {
+ if (getSetting("MissingE_askTweaks_enabled",1) == 1) {
injectStyles.push({file: "core/askTweaks/askTweaks.css"});
}
}
@@ -554,7 +560,63 @@
activeScripts.massEditor = false;
}
}
+ if (!request.isFrame &&
+ MissingE.isTumblrURL(request.url,
+ ["dashboard",
+ "blog",
+ "blogData",
+ "drafts",
+ "queue",
+ "messages",
+ "likes",
+ "tagged"])) {
+ if (getSetting("MissingE_askTweaks_enabled",1) == 1) {
+ if (getSetting("MissingE_askTweaks_massDelete",1) == 1) {
+ getImages(["core/askTweaks/massDelete.png"], function(result) {
+ e.source.postMessage({greeting: "sendImages", imgs: result});
+ });
+ }
+ needUI = true;
+ needUIdraggable = true;
+ injectScripts.push("core/askTweaks/askTweaks.js");
+ activeScripts.askTweaks = true;
+ }
+ else {
+ activeScripts.askTweaks = false;
+ }
+ }
+
+ if (activeScripts.magnifier ||
+ (activeScripts.askTweaks &&
+ getSetting("MissingE_askTweaks_askDash",0) == 1)) {
+ zindexFix = true;
+ getImages(["lib/facebox/closelabel.png",
+ "lib/facebox/loading.gif"], function(result) {
+ for (i in result) {
+ console.log(i);
+ }
+ e.source.postMessage({greeting: "sendImages", imgs: result});
+ });
+ injectStyles.push("lib/facebox/facebox.css");
+ var pos = injectScripts.indexOf("core/utils.js");
+ injectScripts.splice(pos+1, 0, "lib/facebox/facebox.js");
+ }
+ // In reverse order of requirements
+ if (needUI) {
+ if (needUIresizable) {
+ injectScripts.unshift("lib/jquery.ui.resizable.min.js");
+ }
+ if (needUIsortable) {
+ injectScripts.unshift("lib/jquery.ui.sortable.min.js");
+ }
+ if (needUIdraggable) {
+ injectScripts.unshift("lib/jquery.ui.draggable.min.js");
+ }
+ injectScripts.unshift("lib/jquery.ui.mouse.min.js");
+ injectScripts.unshift("lib/jquery.ui.widget.min.js");
+ injectScripts.unshift("lib/jquery.ui.core.min.js");
+ }
injectScripts.unshift("lib/evalFix.js");
injectScripts.unshift("lib/jquery-1.7.2.min.js");
if (zindexFix) {
View
3  opera/whoami.js
@@ -43,7 +43,8 @@ if ((window.top === window &&
info += active.url + "\n";
for (i in active) {
if (active.hasOwnProperty(i)) {
- if (i !== 'url' && i !== 'version') {
+ if (i !== 'url' && i !== 'version' && i !== "files" &&
+ i !== "greeting" && i !== "isFrame") {
info += i + ": " + (active[i] ? "active" : "inactive") + "\n";
}
}
View
2  site/currentVersion.js
@@ -1 +1 @@
-var currentVersion="2.9.15";
+var currentVersion="2.9.16";
View
4 site/index.html
@@ -99,7 +99,7 @@
<div id="uptodate"></div>
<div id="notuptodate"></div>
</div>
-<div version="2.9.15" id="versioncheck" style="display:none"></div>
+<div version="2.9.16" id="versioncheck" style="display:none"></div>
<header>
<nav>
<div id="nav_bar">
@@ -136,7 +136,7 @@
<span id="download_txt">Download</span>
<span id="installed_txt" style="display:none;">Installed</span>
<span id="update_txt" style="display:none;">Update</span>
- <span id="download_version">Version 2.9.15</span>
+ <span id="download_version">Version 2.9.16</span>
</a>
<div id="download_info">
By using this extension, you agree<br />
View
2  site/update.html
@@ -170,7 +170,7 @@
<div id="uptodate"></div>
<div id="notuptodate"></div>
</div>
-<div version="2.9.15" id="versioncheck" style="display:none"></div>
+<div version="2.9.16" id="versioncheck" style="display:none"></div>
<header>
<nav>
<div id="nav_bar">

No commit comments for this range

Something went wrong with that request. Please try again.