Skip to content

Commit fc5bd5c

Browse files
VishaalKVishaalK
committed
Merge branch 'master' into bug/selected-state-on-mode-buttons
2 parents 7147fc0 + c1bd8e7 commit fc5bd5c

File tree

11 files changed

+54
-88
lines changed

11 files changed

+54
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## 3.6.0 (February 17, 2017)
4+
* Bug: We were still injecting an empty div into the non-Chrome browsers. This fixes that situation.
5+
6+
## 3.5.2 (February 17, 2017)
7+
* Bug: Fix Region mode being off on high dpi screens like Retina or Surface Book in Firefox
8+
* Bug: Article mode was sometimes being shown when we should have been in PDF mode.
9+
310
## 3.4.5 (February 1, 2017)
411
* Bug: Unable to sign into Edge because of third-party cookie detection issue.
512

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.4.5",
2+
"version": "3.6.0",
33
"name": "webclipper",
44
"private": true,
55
"description": "The core of the OneNote Web Clipper found at https://www.onenote.com/clipper",
@@ -11,21 +11,21 @@
1111
"url": "git+https://github.com/OneNoteDev/WebClipper.git"
1212
},
1313
"devDependencies": {
14-
"@types/chrome": "0.0.38",
14+
"@types/chrome": "0.0.40",
1515
"@types/es6-promise": "0.0.32",
16-
"@types/jquery": "2.0.39",
17-
"@types/lodash": "4.14.50",
16+
"@types/jquery": "2.0.40",
17+
"@types/lodash": "4.14.52",
1818
"@types/mithril": "0.0.31",
1919
"@types/pdf": "0.0.31",
2020
"@types/popper.js": "0.4.5",
2121
"@types/qunit": "1.16.30",
2222
"@types/rangy": "0.0.27",
2323
"@types/safari-extension": "0.0.27",
2424
"@types/sanitize-html": "1.13.31",
25-
"@types/sinon": "1.16.34",
25+
"@types/sinon": "1.16.35",
2626
"@types/urijs": "1.15.31",
2727
"@types/velocity-animate": "1.2.29",
28-
"browserify": "13.3.0",
28+
"browserify": "14.1.0",
2929
"del": "2.2.2",
3030
"es5-shim": "4.5.9",
3131
"es6-promise": "4.0.5",
@@ -45,8 +45,8 @@
4545
"gulp-shell": "0.5.2",
4646
"gulp-tslint": "6.1.2",
4747
"gulp-typescript": "3.1.4",
48-
"gulp-uglify": "2.0.0",
49-
"gulp-zip": "3.2.0",
48+
"gulp-uglify": "2.0.1",
49+
"gulp-zip": "4.0.0",
5050
"json3": "3.3.2",
5151
"lodash": "4.17.4",
5252
"merge-stream": "1.0.1",
@@ -55,19 +55,19 @@
5555
"node-static": "0.7.9",
5656
"onenoteapi": "1.1.0",
5757
"onenotepicker": "1.0.6",
58-
"pdfjs-dist": "1.6.458",
59-
"popper.js": "1.0.4",
58+
"pdfjs-dist": "1.7.290",
59+
"popper.js": "1.0.6",
6060
"qunitjs": "1.20.0",
6161
"rangy": "1.3.0",
6262
"run-sequence": "1.2.2",
63-
"sanitize-html": "1.13.0",
63+
"sanitize-html": "1.14.1",
6464
"sinon": "1.17.7",
6565
"sinon-qunit": "2.0.0",
6666
"ssl-root-cas": "1.2.3",
6767
"tslint": "3.15.1",
68-
"typescript": "2.1.5",
69-
"urijs": "1.18.4",
70-
"velocity-animate": "1.4.0",
68+
"typescript": "2.1.6",
69+
"urijs": "1.18.7",
70+
"velocity-animate": "1.4.2",
7171
"vinyl-source-stream": "1.1.0",
7272
"yargs": "6.6.0"
7373
}

‎src/scripts/clipperUI/clipper.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,12 @@ class ClipperClass extends ComponentBase<ClipperState, {}> {
557557
}
558558

559559
if (this.state && this.state.pageInfo) {
560+
if (this.state.pageInfo.contentType === OneNoteApi.ContentType.EnhancedUrl) {
561+
return ClipMode.Pdf;
562+
}
563+
560564
if (UrlUtils.onWhitelistedDomain(this.state.pageInfo.rawUrl)) {
561565
return ClipMode.Augmentation;
562-
} else if (this.state.pageInfo.contentType === OneNoteApi.ContentType.EnhancedUrl) {
563-
return ClipMode.Pdf;
564566
}
565567
}
566568

‎src/scripts/clipperUI/regionSelector.tsx‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {DomUtils} from "../domParsers/domUtils";
33
import * as Log from "../logging/log";
44

55
import {Constants} from "../constants";
6+
import {ClientType} from "../clientType";
67
import {Status} from "./status";
78

89
import {ClipperStateProp} from "./clipperState";
@@ -199,8 +200,17 @@ class RegionSelectorClass extends ComponentBase<RegionSelectorState, ClipperStat
199200
* the maximum allowed size)
200201
*/
201202
private startRegionClip() {
203+
// Taken from https://www.kirupa.com/html5/detecting_retina_high_dpi.htm
204+
// We check this here so that we can log it as a custom property on the regionSelectionProcessingEvent
205+
const query = "(-webkit-min-device-pixel-ratio: 2), (min-device-pixel-ratio: 2), (min-resolution: 192dpi)";
206+
const isHighDpiScreen = matchMedia(query).matches;
207+
const isFirefoxWithHighDpiDisplay = this.props.clipperState.clientInfo.clipperType === ClientType.FirefoxExtension && isHighDpiScreen;
208+
202209
// Firefox reports this value incorrectly if this iframe is hidden, so store it now since we know we're visible
203-
this.devicePixelRatio = window.devicePixelRatio;
210+
// In addition to this, Firefox currently has a bug where they are not using devicePixelRatio correctly
211+
// on HighDPI screens such as Retina screens or the Surface Pro 4
212+
// Bug link: https://bugzilla.mozilla.org/show_bug.cgi?id=1278507
213+
this.devicePixelRatio = isFirefoxWithHighDpiDisplay ? window.devicePixelRatio / 2 : window.devicePixelRatio;
204214

205215
let regionSelectionProcessingEvent = new Log.Event.BaseEvent(Log.Event.Label.RegionSelectionProcessing);
206216
let regionSelectionCapturingEvent = new Log.Event.BaseEvent(Log.Event.Label.RegionSelectionCapturing);
@@ -213,6 +223,7 @@ class RegionSelectorClass extends ComponentBase<RegionSelectorState, ClipperStat
213223
this.saveCompressedSelectionToState(dataUrl).then((canvas) => {
214224
regionSelectionProcessingEvent.setCustomProperty(Log.PropertyName.Custom.Width, canvas.width);
215225
regionSelectionProcessingEvent.setCustomProperty(Log.PropertyName.Custom.Height, canvas.height);
226+
regionSelectionProcessingEvent.setCustomProperty(Log.PropertyName.Custom.IsHighDpiScreen, isHighDpiScreen);
216227
Clipper.logger.logEvent(regionSelectionProcessingEvent);
217228
});
218229
}
@@ -248,6 +259,8 @@ class RegionSelectorClass extends ComponentBase<RegionSelectorState, ClipperStat
248259
return Promise.reject(new Error("Expected the two points to be set, but they were not"));
249260
}
250261

262+
const devicePixelRatio = this.devicePixelRatio;
263+
251264
return new Promise<HTMLCanvasElement>((resolve) => {
252265
let regionSelectionLoadingEvent = new Log.Event.BaseEvent(Log.Event.Label.RegionSelectionLoading);
253266
let img: HTMLImageElement = new Image();
@@ -264,17 +277,16 @@ class RegionSelectorClass extends ComponentBase<RegionSelectorState, ClipperStat
264277
let destinationOffsetY = 0;
265278
let width = (xMax - xMin);
266279
let height = (yMax - yMin);
267-
let sourceOffsetX = xMin * this.devicePixelRatio;
268-
let sourceOffsetY = yMin * this.devicePixelRatio;
269-
let sourceWidth = (xMax - xMin) * this.devicePixelRatio;
270-
let sourceHeight = (yMax - yMin) * this.devicePixelRatio;
280+
let sourceOffsetX = xMin * devicePixelRatio;
281+
let sourceOffsetY = yMin * devicePixelRatio;
282+
let sourceWidth = (xMax - xMin) * devicePixelRatio;
283+
let sourceHeight = (yMax - yMin) * devicePixelRatio;
271284

272285
let canvas: HTMLCanvasElement = document.createElement("canvas") as HTMLCanvasElement;
273286
canvas.width = width;
274287
canvas.height = height;
275288
let ctx: CanvasRenderingContext2D = canvas.getContext("2d");
276289
ctx.drawImage(img, sourceOffsetX, sourceOffsetY, sourceWidth, sourceHeight, destinationOffsetX, destinationOffsetY, width, height);
277-
278290
resolve(canvas);
279291
};
280292

‎src/scripts/extensions/chrome/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "OneNote Web Clipper",
44
"description": "__MSG_appDesc__",
55
"default_locale": "en",
6-
"version": "3.4.5",
6+
"version": "3.6.0",
77
"background": {
88
"scripts": [ "chromeExtension.js" ]
99
},

‎src/scripts/extensions/edge/manifest.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
"name": "OneNote Web Clipper",
44
"description": "__MSG_appDesc__",
55
"default_locale": "en",
6-
"version": "3.4.5.0",
7-
6+
"version": "3.6.0",
87
"background": {
9-
"page": "edgeExtension.html",
8+
"scripts": [ "edgeExtension.js" ],
109
"persistent": true
1110
},
1211

1312
"content_scripts": [{
14-
"matches": ["<all_urls>"],
13+
"matches": ["https://onenote.officeapps.live.com/*", "https://ppc-onenote.officeapps.live.com/*", "https://onenote.officeapps-df.live.com/*", "https://onenote.officeapps.live-int.com/*"],
1514
"js": ["appendIsInstalledMarker.js"],
1615
"run_at": "document_start",
1716
"all_frames": true
@@ -53,7 +52,5 @@
5352
"96": "icons/icon-96.png",
5453
"128": "icons/icon-128.png",
5554
"256": "icons/icon-256.png"
56-
},
57-
58-
"minimum_edge_version": "37.14316.1000.0"
55+
}
5956
}

‎src/scripts/extensions/edge/package/AppXManifest.xml‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Identity
88
Name="Microsoft.OneNoteWebClipper"
99
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
10-
Version="3.4.5.0" />
10+
Version="3.6.0.0" />
1111

1212
<Properties>
1313
<DisplayName>OneNote Web Clipper</DisplayName>
@@ -20,59 +20,7 @@
2020
</Dependencies>
2121

2222
<Resources>
23-
<Resource Language="en" />
24-
<Resource Language="am" />
25-
<Resource Language="ar" />
26-
<Resource Language="bg" />
27-
<Resource Language="bn" />
28-
<Resource Language="ca" />
29-
<Resource Language="cs" />
30-
<Resource Language="da" />
31-
<Resource Language="de" />
32-
<Resource Language="el" />
33-
<Resource Language="en-gb" />
3423
<Resource Language="en-us" />
35-
<Resource Language="es" />
36-
<Resource Language="es-419" />
37-
<Resource Language="et" />
38-
<Resource Language="fa" />
39-
<Resource Language="fi" />
40-
<Resource Language="fil" />
41-
<Resource Language="fr" />
42-
<Resource Language="gu" />
43-
<Resource Language="he" />
44-
<Resource Language="hi" />
45-
<Resource Language="hr" />
46-
<Resource Language="hu" />
47-
<Resource Language="id" />
48-
<Resource Language="it" />
49-
<Resource Language="ja" />
50-
<Resource Language="kn" />
51-
<Resource Language="ko" />
52-
<Resource Language="lt" />
53-
<Resource Language="lv" />
54-
<Resource Language="ml" />
55-
<Resource Language="mr" />
56-
<Resource Language="ms" />
57-
<Resource Language="nl" />
58-
<Resource Language="no" />
59-
<Resource Language="pl" />
60-
<Resource Language="pt-br" />
61-
<Resource Language="pt-pt" />
62-
<Resource Language="ro" />
63-
<Resource Language="ru" />
64-
<Resource Language="sk" />
65-
<Resource Language="sl" />
66-
<Resource Language="sv" />
67-
<Resource Language="sw" />
68-
<Resource Language="ta" />
69-
<Resource Language="te" />
70-
<Resource Language="th" />
71-
<Resource Language="tr" />
72-
<Resource Language="uk" />
73-
<Resource Language="vi" />
74-
<Resource Language="zh-cn" />
75-
<Resource Language="zh-tw" />
7624
<Resource uap:Scale="200"/>
7725
</Resources>
7826

‎src/scripts/extensions/extensionBase.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export abstract class ExtensionBase<TWorker extends ExtensionWorkerBase<TTab, TT
4242
protected auth: AuthenticationHelper;
4343
protected tooltip: TooltipHelper;
4444
protected clientInfo: SmartValue<ClientInfo>;
45-
protected static version = "3.4.5";
45+
protected static version = "3.6.0";
4646

4747
constructor(clipperType: ClientType, clipperData: ClipperData) {
4848
this.setUnhandledExceptionLogging();

‎src/scripts/extensions/firefox/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"name": "OneNote Web Clipper",
44
"description": "__MSG_appDesc__",
55
"default_locale": "en",
6-
"version": "3.4.5",
6+
"version": "3.6.0",
77
"background": {
88
"scripts": [ "firefoxExtension.js" ]
99
},
1010

1111
"content_scripts": [{
12-
"matches": ["<all_urls>"],
12+
"matches": ["https://onenote.officeapps.live.com/*", "https://ppc-onenote.officeapps.live.com/*", "https://onenote.officeapps-df.live.com/*", "https://onenote.officeapps.live-int.com/*"],
1313
"js": ["appendIsInstalledMarker.js"],
1414
"run_at": "document_start",
1515
"all_frames": true

‎src/scripts/extensions/safari/Info.plist‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundleShortVersionString</key>
1616
<string>3.4</string>
1717
<key>CFBundleVersion</key>
18-
<string>3.4.5</string>
18+
<string>3.6.0</string>
1919
<key>Chrome</key>
2020
<dict>
2121
<key>Global Page</key>
@@ -42,7 +42,6 @@
4242
<dict>
4343
<key>Start</key>
4444
<array>
45-
<string>appendIsInstalledMarker.js</string>
4645
<string>safariDebugLoggingInject.js</string>
4746
<string>safariInject.js</string>
4847
<string>safariPageNavInject.js</string>

0 commit comments

Comments
 (0)