Skip to content

Commit 679c9c7

Browse files
author
Daniel Larsen
committed
Merge remote-tracking branch 'refs/remotes/OneNoteDev/master' into feature/typescript2.0
# Conflicts: # src/scripts/clipperUI/clipper.tsx # src/tests/utils_tests.ts # typings.json
2 parents db47ced + 56bed98 commit 679c9c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+10315
-182
lines changed

‎THIRD-PARTY-NOTICES.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@ In the event that we accidentally failed to list a required notice, please
88
bring it to our attention. Post an issue or email us:
99

1010
[email protected]
11+
12+
-------------------------------------------
13+
14+
sanitize-html
15+
16+
Copyright (c) 2013, 2014, 2015 P'unk Avenue LLC
17+
18+
Permission is hereby granted, free of charge, to any person obtaining a
19+
copy of this software and associated documentation files (the "Software"),
20+
to deal in the Software without restriction, including without limitation
21+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
22+
and/or sell copies of the Software, and to permit persons to whom the
23+
Software is furnished to do so, subject to the following conditions:
24+
25+
The above copyright notice and this permission notice shall be included
26+
in all copies or substantial portions of the Software.
27+
28+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
29+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
30+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
31+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
32+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
33+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
34+
THE SOFTWARE.
1135

1236
-------------------------------------------
1337

‎gulpfile.js‎

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,15 @@ gulp.task("tslint", function() {
205205
////////////////////////////////////////
206206
// BUNDLE
207207
////////////////////////////////////////
208+
gulp.task("bundleAppendIsInstalledMarker", function () {
209+
var appendIsInstalledMarkerTask = browserify(PATHS.BUILDROOT + "scripts/extensions/appendIsInstalledMarker.js")
210+
.bundle()
211+
.pipe(source("appendIsInstalledMarker.js"))
212+
.pipe(gulp.dest(PATHS.BUNDLEROOT));
213+
214+
return appendIsInstalledMarkerTask;
215+
});
216+
208217
gulp.task("bundleClipperUI", function() {
209218
var clipperJsTask = browserify(PATHS.BUILDROOT + "scripts/clipperUI/clipper.js")
210219
.bundle()
@@ -365,6 +374,7 @@ gulp.task("bundleTests", function() {
365374

366375
gulp.task("bundle", function(callback) {
367376
runSequence(
377+
"bundleAppendIsInstalledMarker",
368378
"bundleClipperUI",
369379
"bundleLogManager",
370380
"bundleBookmarklet",
@@ -433,7 +443,8 @@ function exportCommonJS(targetDir) {
433443
var injectLibPaths = [
434444
PATHS.NODE_MODULES + "oneNoteApi/target/oneNoteApi.min.js",
435445
PATHS.NODE_MODULES + "rangy/lib/rangy-core.js",
436-
PATHS.NODE_MODULES + "urijs/src/URI.min.js"
446+
PATHS.NODE_MODULES + "urijs/src/URI.min.js",
447+
PATHS.LIBROOT + "sanitize-html.js"
437448
];
438449
var injectLibsTask = gulp.src(assertModuleExists(injectLibPaths)).pipe(gulp.dest(targetDir));
439450

@@ -475,7 +486,8 @@ function exportCommonLibFiles(targetDir) {
475486
PATHS.NODE_MODULES + "pdfjs-dist/build/pdf.combined.js",
476487
PATHS.NODE_MODULES + "rangy/lib/rangy-core.js",
477488
PATHS.NODE_MODULES + "urijs/src/URI.min.js",
478-
PATHS.NODE_MODULES + "velocity-animate/velocity.min.js"
489+
PATHS.NODE_MODULES + "velocity-animate/velocity.min.js",
490+
PATHS.LIBROOT + "sanitize-html.js"
479491
];
480492

481493
var exportTask = gulp.src(assertModuleExists(libFiles))
@@ -509,6 +521,7 @@ function exportBookmarkletJS(targetDir) {
509521
targetDir + "logManager.js",
510522
targetDir + "oneNoteApi.min.js",
511523
targetDir + "rangy-core.js",
524+
targetDir + "sanitize-html.js",
512525
targetDir + "URI.min.js",
513526
PATHS.BUNDLEROOT + "bookmarklet.js"
514527
]).pipe(concat("invoke.js")).pipe(gulp.dest(targetDir));
@@ -567,6 +580,10 @@ function exportChromeJS() {
567580

568581
var commonTask = exportCommonJS(targetDir);
569582

583+
var appendIsInstalledMarkerTask = gulp.src([
584+
PATHS.BUNDLEROOT + "appendIsInstalledMarker.js"
585+
]).pipe(concat("appendIsInstalledMarker.js")).pipe(gulp.dest(targetDir));
586+
570587
var chromeExtensionTask = gulp.src([
571588
targetDir + "logManager.js",
572589
targetDir + "oneNoteApi.min.js",
@@ -581,6 +598,7 @@ function exportChromeJS() {
581598
targetDir + "logManager.js",
582599
targetDir + "oneNoteApi.min.js",
583600
targetDir + "rangy-core.js",
601+
targetDir + "sanitize-html.js",
584602
targetDir + "URI.min.js",
585603
PATHS.BUNDLEROOT + "chromeInject.js"
586604
]).pipe(concat("chromeInject.js")).pipe(gulp.dest(targetDir));
@@ -591,9 +609,9 @@ function exportChromeJS() {
591609
]).pipe(concat("chromePageNavInject.js")).pipe(gulp.dest(targetDir));
592610

593611
if (commonTask) {
594-
return merge(commonTask, chromeExtensionTask, chromeDebugLoggingInjectTask, chromeInjectTask, chromePageNavInjectTask);
612+
return merge(commonTask, appendIsInstalledMarkerTask, chromeExtensionTask, chromeDebugLoggingInjectTask, chromeInjectTask, chromePageNavInjectTask);
595613
}
596-
return merge(chromeExtensionTask, chromeDebugLoggingInjectTask, chromeInjectTask, chromePageNavInjectTask);
614+
return merge(chromeExtensionTask, appendIsInstalledMarkerTask, chromeDebugLoggingInjectTask, chromeInjectTask, chromePageNavInjectTask);
597615
}
598616

599617
function exportChromeCSS() {
@@ -624,6 +642,10 @@ function exportEdgeJS() {
624642

625643
var commonTask = exportCommonJS(targetDir);
626644

645+
var appendIsInstalledMarkerTask = gulp.src([
646+
PATHS.BUNDLEROOT + "appendIsInstalledMarker.js"
647+
]).pipe(concat("appendIsInstalledMarker.js")).pipe(gulp.dest(targetDir));
648+
627649
var edgeExtensionTask = gulp.src([
628650
targetDir + "logManager.js",
629651
targetDir + "oneNoteApi.min.js",
@@ -638,6 +660,7 @@ function exportEdgeJS() {
638660
targetDir + "logManager.js",
639661
targetDir + "oneNoteApi.min.js",
640662
targetDir + "rangy-core.js",
663+
targetDir + "sanitize-html.js",
641664
targetDir + "URI.min.js",
642665
PATHS.BUNDLEROOT + "edgeInject.js"
643666
]).pipe(concat("edgeInject.js")).pipe(gulp.dest(targetDir));
@@ -648,9 +671,9 @@ function exportEdgeJS() {
648671
]).pipe(concat("edgePageNavInject.js")).pipe(gulp.dest(targetDir));
649672

650673
if (commonTask) {
651-
return merge(commonTask, edgeExtensionTask, edgeDebugLoggingInjectTask, edgeInjectTask, edgePageNavInjectTask);
674+
return merge(commonTask, appendIsInstalledMarkerTask, edgeExtensionTask, edgeDebugLoggingInjectTask, edgeInjectTask, edgePageNavInjectTask);
652675
}
653-
return merge(edgeExtensionTask, edgeDebugLoggingInjectTask, edgeInjectTask, edgePageNavInjectTask);
676+
return merge(edgeExtensionTask, appendIsInstalledMarkerTask, edgeDebugLoggingInjectTask, edgeInjectTask, edgePageNavInjectTask);
654677
}
655678

656679
function exportEdgeCSS() {
@@ -703,6 +726,10 @@ function exportFirefoxJS() {
703726

704727
var commonTask = exportCommonJS(targetDir);
705728

729+
var appendIsInstalledMarkerTask = gulp.src([
730+
PATHS.BUNDLEROOT + "appendIsInstalledMarker.js"
731+
]).pipe(concat("appendIsInstalledMarker.js")).pipe(gulp.dest(targetDir));
732+
706733
var firefoxExtensionTask = gulp.src([
707734
targetDir + "logManager.js",
708735
targetDir + "oneNoteApi.min.js",
@@ -717,6 +744,7 @@ function exportFirefoxJS() {
717744
targetDir + "logManager.js",
718745
targetDir + "oneNoteApi.min.js",
719746
targetDir + "rangy-core.js",
747+
targetDir + "sanitize-html.js",
720748
targetDir + "URI.min.js",
721749
PATHS.BUNDLEROOT + "firefoxInject.js"
722750
]).pipe(concat("firefoxInject.js")).pipe(gulp.dest(targetDir));
@@ -727,9 +755,9 @@ function exportFirefoxJS() {
727755
]).pipe(concat("firefoxPageNavInject.js")).pipe(gulp.dest(targetDir));
728756

729757
if (commonTask) {
730-
return merge(commonTask, firefoxExtensionTask, firefoxDebugLoggingInjectTask, firefoxInjectTask, firefoxPageNavInjectTask);
758+
return merge(commonTask, appendIsInstalledMarkerTask, firefoxExtensionTask, firefoxDebugLoggingInjectTask, firefoxInjectTask, firefoxPageNavInjectTask);
731759
}
732-
return merge(firefoxExtensionTask, firefoxDebugLoggingInjectTask, firefoxInjectTask, firefoxPageNavInjectTask);
760+
return merge(firefoxExtensionTask, appendIsInstalledMarkerTask, firefoxDebugLoggingInjectTask, firefoxInjectTask, firefoxPageNavInjectTask);
733761
}
734762

735763
function exportFirefoxCSS() {
@@ -760,6 +788,10 @@ function exportSafariJS() {
760788

761789
var commonTask = exportCommonJS(targetDir);
762790

791+
var appendIsInstalledMarkerTask = gulp.src([
792+
PATHS.BUNDLEROOT + "appendIsInstalledMarker.js"
793+
]).pipe(concat("appendIsInstalledMarker.js")).pipe(gulp.dest(targetDir));
794+
763795
var safariExtensionTask = gulp.src([
764796
targetDir + "logManager.js",
765797
targetDir + "oneNoteApi.min.js",
@@ -774,6 +806,7 @@ function exportSafariJS() {
774806
targetDir + "logManager.js",
775807
targetDir + "oneNoteApi.min.js",
776808
targetDir + "rangy-core.js",
809+
targetDir + "sanitize-html.js",
777810
targetDir + "URI.min.js",
778811
PATHS.BUNDLEROOT + "safariInject.js"
779812
]).pipe(concat("safariInject.js")).pipe(gulp.dest(targetDir));
@@ -784,9 +817,9 @@ function exportSafariJS() {
784817
]).pipe(concat("safariPageNavInject.js")).pipe(gulp.dest(targetDir));
785818

786819
if (commonTask) {
787-
return merge(commonTask, safariExtensionTask, safariDebugLoggingInjectTask, safariInjectTask, safariPageNavInjectTask);
820+
return merge(commonTask, appendIsInstalledMarkerTask, safariExtensionTask, safariDebugLoggingInjectTask, safariInjectTask, safariPageNavInjectTask);
788821
}
789-
return merge(safariExtensionTask, safariDebugLoggingInjectTask, safariInjectTask, safariPageNavInjectTask);
822+
return merge(safariExtensionTask, appendIsInstalledMarkerTask, safariDebugLoggingInjectTask, safariInjectTask, safariPageNavInjectTask);
790823
}
791824

792825
function exportSafariCSS() {
@@ -849,7 +882,8 @@ function exportTestLibFiles() {
849882
PATHS.NODE_MODULES + "sinon-qunit/lib/sinon-qunit.js",
850883
PATHS.NODE_MODULES + "urijs/src/URI.min.js",
851884
PATHS.SRC.ROOT + "scripts/highlighting/textHighlighter.js",
852-
PATHS.NODE_MODULES + "velocity-animate/velocity.js"
885+
PATHS.NODE_MODULES + "velocity-animate/velocity.js",
886+
PATHS.LIBROOT + "sanitize-html.js"
853887
];
854888

855889
var testLibFileRegexes = [PATHS.NODE_MODULES + "qunitjs/qunit/qunit.+(css|js)"];

0 commit comments

Comments
 (0)