Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5271 from Rob--W/opera-fixes

Browse Source 
Opera fixes
This commit is contained in:
Yury Delendik 2014-09-09 10:10:04 -05:00
commit 9261cd9766
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/chromium/pdfHandler-v2.js
View File

@ -180,6 +180,16 @@ limitations under the License.
* (added in Chrome 29, http://crbug.com/230346) * (added in Chrome 29, http://crbug.com/230346)
*/ */
function handleStream(mimeType, pdfUrl, streamUrl, tabId, expectedSize) { function handleStream(mimeType, pdfUrl, streamUrl, tabId, expectedSize) {
if (typeof mimeType === 'object') {
// API change: argument list -> object, see crbug.com/345882
// documentation: chrome/common/extensions/api/streams_private.idl
var streamInfo = mimeType;
mimeType = streamInfo.mimeType;
pdfUrl = streamInfo.originalUrl;
streamUrl = streamInfo.streamUrl;
tabId = streamInfo.tabId;
expectedSize = streamInfo.expectedContentSize;
}
console.log('Intercepted ' + mimeType + ' in tab ' + tabId + ' with URL ' + console.log('Intercepted ' + mimeType + ' in tab ' + tabId + ' with URL ' +
pdfUrl + '\nAvailable as: ' + streamUrl); pdfUrl + '\nAvailable as: ' + streamUrl);
streamSupportsTabId = typeof tabId === 'number'; streamSupportsTabId = typeof tabId === 'number';

6
web/preferences.js
View File

@ -204,11 +204,15 @@ var Preferences = {
// // These preferences can be overridden by the user. // // These preferences can be overridden by the user.
// chrome.storage.managed.get(DEFAULT_PREFERENCES, getPreferences); // chrome.storage.managed.get(DEFAULT_PREFERENCES, getPreferences);
// } else { // } else {
// // Managed storage not supported, e.g. in Opera. // // Managed storage not supported, e.g. in old Chromium versions.
// getPreferences(DEFAULT_PREFERENCES); // getPreferences(DEFAULT_PREFERENCES);
// } // }
// //
// function getPreferences(defaultPrefs) { // function getPreferences(defaultPrefs) {
// if (chrome.runtime.lastError) {
// // Managed storage not supported, e.g. in Opera.
// defaultPrefs = DEFAULT_PREFERENCES;
// }
// chrome.storage.local.get(defaultPrefs, function(readPrefs) { // chrome.storage.local.get(defaultPrefs, function(readPrefs) {
// resolve(readPrefs); // resolve(readPrefs);
// }); // });