Upgrade Umbraco 7.15.10
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
For full details of the client dependency framework, visit
|
||||
https://github.com/Shandem/ClientDependency
|
||||
@@ -10,8 +9,7 @@ NOTES:
|
||||
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
|
||||
* A new version will invalidate both client and server cache and create new persisted files
|
||||
-->
|
||||
<clientDependency version="2027227464" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
|
||||
|
||||
<clientDependency version="1171529440" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
|
||||
<!--
|
||||
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
|
||||
The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
|
||||
@@ -25,7 +23,6 @@ NOTES:
|
||||
<add name="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
|
||||
</providers>
|
||||
</fileRegistration>
|
||||
|
||||
<!-- This section is used for MVC only -->
|
||||
<mvc defaultRenderer="StandardRenderer">
|
||||
<renderers>
|
||||
@@ -33,7 +30,6 @@ NOTES:
|
||||
<add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
|
||||
</renderers>
|
||||
</mvc>
|
||||
|
||||
<!--
|
||||
The composite file section configures the compression/combination/minification of files.
|
||||
You can enable/disable minification of either JS/CSS files and you can enable/disable the
|
||||
@@ -46,11 +42,9 @@ NOTES:
|
||||
<fileProcessingProviders>
|
||||
<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
|
||||
</fileProcessingProviders>
|
||||
|
||||
<!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
|
||||
<fileMapProviders>
|
||||
<add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
|
||||
</fileMapProviders>
|
||||
|
||||
</compositeFiles>
|
||||
</clientDependency>
|
||||
</clientDependency>
|
||||
@@ -2,9 +2,9 @@
|
||||
<caching currentCache="DiskCache">
|
||||
<caches>
|
||||
<cache trimCache="false" name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" memoryMaxMinutes="1" browserMaxDays="7">
|
||||
|
||||
<settings>
|
||||
<settings>
|
||||
<setting key="VirtualCachePath" value="~/app_data/cache" />
|
||||
</settings></cache>
|
||||
</settings>
|
||||
</cache>
|
||||
</caches>
|
||||
</caching>
|
||||
@@ -1,9 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<processing preserveExifMetaData="true" metaDataMode="None" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
|
||||
|
||||
|
||||
<presets>
|
||||
</presets><plugins>
|
||||
<presets>
|
||||
</presets>
|
||||
<plugins>
|
||||
<plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
|
||||
<plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" />
|
||||
<plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
|
||||
@@ -64,4 +63,5 @@
|
||||
<plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
|
||||
<plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
|
||||
<plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
|
||||
</plugins></processing>
|
||||
</plugins>
|
||||
</processing>
|
||||
@@ -1,19 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<settings>
|
||||
|
||||
<!--
|
||||
umbracoSettings.config configuration documentation can be found here:
|
||||
https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
|
||||
Many of the optional settings are not explicitly listed here
|
||||
but can be found in the online documentation.
|
||||
-->
|
||||
|
||||
<backOffice>
|
||||
<tours enable="false"></tours>
|
||||
</backOffice>
|
||||
|
||||
<backOffice>
|
||||
<tours enable="false">
|
||||
</tours>
|
||||
</backOffice>
|
||||
<content>
|
||||
|
||||
<errors>
|
||||
<error404>1</error404>
|
||||
<!--
|
||||
@@ -27,21 +24,16 @@
|
||||
<errorPage culture="default">1</errorPage>
|
||||
<errorPage culture="en-US">200</errorPage>
|
||||
</error404>
|
||||
-->
|
||||
-->
|
||||
</errors>
|
||||
|
||||
<notifications>
|
||||
<!-- the email that should be used as from mail when umbraco sends a notification -->
|
||||
<email>kolpacksoftware@gmail.com</email>
|
||||
</notifications>
|
||||
|
||||
<!-- Show property descriptions in editing view "icon|text|none" -->
|
||||
<PropertyContextHelpOption>text</PropertyContextHelpOption>
|
||||
|
||||
<!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
|
||||
<PreviewBadge>
|
||||
<![CDATA[<a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;z-index: 9999999;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
|
||||
|
||||
<PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;z-index: 9999999;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
|
||||
<!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
|
||||
- inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
|
||||
- silent - Silently suppress the error and do not render the offending macro.
|
||||
@@ -49,21 +41,15 @@
|
||||
error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
|
||||
Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
|
||||
<MacroErrors>throw</MacroErrors>
|
||||
|
||||
<!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
|
||||
<disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
|
||||
|
||||
<!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
|
||||
<defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
|
||||
|
||||
<!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
|
||||
<EnablePropertyValueConverters>true</EnablePropertyValueConverters>
|
||||
|
||||
<!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
|
||||
<loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
|
||||
|
||||
</content>
|
||||
|
||||
<security>
|
||||
<!-- set to true to auto update login interval (and there by disabling the lock screen -->
|
||||
<keepUserLoggedIn>false</keepUserLoggedIn>
|
||||
@@ -72,37 +58,30 @@
|
||||
<!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
|
||||
<hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
|
||||
</security>
|
||||
|
||||
<requestHandler>
|
||||
<!-- this will ensure that urls are unique when running with multiple root nodes -->
|
||||
<useDomainPrefixes>false</useDomainPrefixes>
|
||||
<!-- this will add a trailing slash (/) to urls when in directory url mode -->
|
||||
<addTrailingSlash>true</addTrailingSlash>
|
||||
<addTrailingSlash>true</addTrailingSlash>
|
||||
</requestHandler>
|
||||
|
||||
<templates>
|
||||
<!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
|
||||
<defaultRenderingEngine>Mvc</defaultRenderingEngine>
|
||||
</templates>
|
||||
|
||||
<scheduledTasks>
|
||||
<!-- add tasks that should be called with an interval (seconds) -->
|
||||
<!-- <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
|
||||
</scheduledTasks>
|
||||
|
||||
<!-- distributed calls must be enabled when using Umbraco in a load balanced environment -->
|
||||
<distributedCall enable="false">
|
||||
<!-- the id of the user who's making the calls -->
|
||||
<!-- needed for security, umbraco will automatically look up correct login and passwords -->
|
||||
<user>0</user>
|
||||
|
||||
<!--
|
||||
When distributed call is enabled, you need to add all of the servers part taking in load balancing
|
||||
to the server list below.
|
||||
-->
|
||||
|
||||
<servers>
|
||||
|
||||
<!--
|
||||
Add ip number or hostname, make sure that it can be reached from all servers
|
||||
you can also add optional attributes to force a protocol or port number.
|
||||
@@ -130,10 +109,8 @@
|
||||
<server serverName="MyServer">server1.mysite.com</server>
|
||||
<server appId="/LM/W3SVC/69/ROOT">server1.mysite.com</server>
|
||||
-->
|
||||
|
||||
</servers>
|
||||
</distributedCall>
|
||||
|
||||
<!--
|
||||
web.routing
|
||||
@trySkipIisCustomErrors
|
||||
@@ -167,10 +144,6 @@
|
||||
Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
|
||||
path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
|
||||
-->
|
||||
<web.routing
|
||||
trySkipIisCustomErrors="false"
|
||||
internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
|
||||
umbracoApplicationUrl="">
|
||||
<web.routing trySkipIisCustomErrors="false" internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false" umbracoApplicationUrl="">
|
||||
</web.routing>
|
||||
|
||||
</settings>
|
||||
|
||||
@@ -182,10 +182,11 @@
|
||||
<key alias="visit">Besök</key>
|
||||
</area>
|
||||
<area alias="prompt">
|
||||
<key alias="stay">Stay</key>
|
||||
<key alias="discardChanges">Discard changes</key>
|
||||
<key alias="unsavedChanges">You have unsaved changes</key>
|
||||
<key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
|
||||
<key alias="stay">Stanna</key>
|
||||
<key alias="discardChanges">Avfärda ändringar</key>
|
||||
<key alias="unsavedChanges">Du har inte sparat dina ändringar</key>
|
||||
<key alias="unsavedChangesWarning">Är du säker på att du vill navigera bort från denna sida? - du har inte sparat dina ändringar</key>
|
||||
<key alias="confirmUnpublish">Avpublicering kommer att ta bort denna sida och alla dess ättlingar från hemsidan.</key>
|
||||
</area>
|
||||
<area alias="bulk">
|
||||
<key alias="done">Done</key>
|
||||
|
||||
@@ -3701,7 +3701,12 @@
|
||||
if (files.length === 1 && $scope.model.selectedImages.length === 0) {
|
||||
var image = $scope.images[$scope.images.length - 1];
|
||||
$scope.target = image;
|
||||
$scope.target.url = mediaHelper.resolveFile(image);
|
||||
// handle both entity and full media object
|
||||
if (image.image) {
|
||||
$scope.target.url = image.image;
|
||||
} else {
|
||||
$scope.target.url = mediaHelper.resolveFile(image);
|
||||
}
|
||||
selectImage(image);
|
||||
}
|
||||
});
|
||||
@@ -9356,7 +9361,7 @@
|
||||
var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) {
|
||||
return e.alias === '_umb_password';
|
||||
});
|
||||
if (passwordProp && passwordProp.value && !passwordProp.value.reset) {
|
||||
if (passwordProp && passwordProp.value && typeof passwordProp.value.reset !== 'undefined' && !passwordProp.value.reset) {
|
||||
//so if the admin is not explicitly resetting the password, flag it for resetting if a new password is being entered
|
||||
passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword;
|
||||
}
|
||||
@@ -14958,7 +14963,7 @@
|
||||
}
|
||||
// Another special case for members, only fields on the base table (cmsMember) can be used for sorting
|
||||
if (e.isSystem && $scope.entityType == 'member') {
|
||||
e.allowSorting = e.alias == 'username' || e.alias == 'email';
|
||||
e.allowSorting = e.alias == 'username' || e.alias == 'email' || e.alias == 'updateDate';
|
||||
}
|
||||
if (e.isSystem) {
|
||||
//localize the header
|
||||
@@ -15197,7 +15202,7 @@
|
||||
// a specific value from one of the methods, so we'll have to try this way. Even though the first method
|
||||
// will fire once per every node moved, the destination path will be the same and we need to use that to sync.
|
||||
var newPath = null;
|
||||
applySelected(function (selected, index) {
|
||||
var attempt = applySelected(function (selected, index) {
|
||||
return contentResource.move({
|
||||
parentId: target.id,
|
||||
id: getIdCallback(selected[index])
|
||||
@@ -15233,6 +15238,11 @@
|
||||
});
|
||||
}
|
||||
});
|
||||
if (attempt) {
|
||||
attempt.then(function () {
|
||||
$scope.getContent();
|
||||
});
|
||||
}
|
||||
}
|
||||
$scope.copy = function () {
|
||||
$scope.copyDialog = {};
|
||||
@@ -15254,7 +15264,7 @@
|
||||
};
|
||||
};
|
||||
function performCopy(target, relateToOriginal) {
|
||||
applySelected(function (selected, index) {
|
||||
var attempt = applySelected(function (selected, index) {
|
||||
return contentResource.copy({
|
||||
parentId: target.id,
|
||||
id: getIdCallback(selected[index]),
|
||||
@@ -15270,6 +15280,11 @@
|
||||
var key = total === 1 ? 'bulk_copiedItem' : 'bulk_copiedItems';
|
||||
return localizationService.localize(key, [total]);
|
||||
});
|
||||
if (attempt) {
|
||||
attempt.then(function () {
|
||||
$scope.getContent();
|
||||
});
|
||||
}
|
||||
}
|
||||
function getCustomPropertyValue(alias, properties) {
|
||||
var value = '';
|
||||
@@ -17130,7 +17145,10 @@
|
||||
// Update model on change, i.e. copy/pasted text, plugins altering content
|
||||
editor.on('SetContent', function (e) {
|
||||
if (!e.initial) {
|
||||
syncContent(editor);
|
||||
// sync content if editor is dirty
|
||||
if (!editor.isNotDirty) {
|
||||
syncContent(editor);
|
||||
}
|
||||
}
|
||||
});
|
||||
editor.on('ObjectResized', function (e) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<form ng-controller="Umbraco.Overlays.EmbedOverlay as vm">
|
||||
|
||||
<umb-control-group label="@general_url">
|
||||
<input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
|
||||
<input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
|
||||
<input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
|
||||
</umb-control-group>
|
||||
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
ng-model="$parent.tagToAdd"
|
||||
ng-keydown="$parent.addTagOnEnter($event)"
|
||||
on-blur="$parent.addTag()"
|
||||
ng-maxlength="200"
|
||||
maxlength="200"
|
||||
localize="placeholder"
|
||||
placeholder="@placeholders_enterTags" />
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<umb-dropdown class="pull-right" ng-if="vm.page.showStatusFilter" on-close="vm.page.showStatusFilter = false;">
|
||||
<umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{ count: '!0', key: '!All'}" style="padding: 8px 20px 8px 16px;">
|
||||
<umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{key: '!All'}" ng-show="userState.count > 0" style="padding: 8px 20px 8px 16px;">
|
||||
<div class="flex items-center">
|
||||
<input
|
||||
id="state-{{$index}}"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 174 KiB After Width: | Height: | Size: 99 KiB |
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,4 +1,4 @@
|
||||
ace.define("ace/snippets/text",["require","exports","module"],function(e,t,n){"use strict";t.snippetText=undefined,t.scope="text"}); (function() {
|
||||
; (function() {
|
||||
ace.require(["ace/snippets/text"], function(m) {
|
||||
if (typeof module == "object" && typeof exports == "object" && module) {
|
||||
module.exports = m;
|
||||
|
||||
File diff suppressed because one or more lines are too long
+5
-3
@@ -293,6 +293,8 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
|
||||
* A leftward swipe is a quick, right-to-left slide of the finger.
|
||||
* Though ngSwipeLeft is designed for touch-based devices, it will work with a mouse click and drag too.
|
||||
*
|
||||
* [well, it did until we disabled that feature to avoid problems with selecting text]
|
||||
*
|
||||
* @element ANY
|
||||
* @param {expression} ngSwipeLeft {@link guide/expression Expression} to evaluate
|
||||
* upon left swipe. (Event object is available as `$event`)
|
||||
@@ -388,7 +390,7 @@ function makeSwipeDirective(directiveName, direction) {
|
||||
deltaY / deltaX < MAX_VERTICAL_RATIO;
|
||||
}
|
||||
|
||||
element.bind('touchstart mousedown', function(event) {
|
||||
element.bind('touchstart', function(event) {
|
||||
startCoords = getCoordinates(event);
|
||||
valid = true;
|
||||
totalX = 0;
|
||||
@@ -401,7 +403,7 @@ function makeSwipeDirective(directiveName, direction) {
|
||||
valid = false;
|
||||
});
|
||||
|
||||
element.bind('touchmove mousemove', function(event) {
|
||||
element.bind('touchmove', function(event) {
|
||||
if (!valid) return;
|
||||
|
||||
// Android will send a touchcancel if it thinks we're starting to scroll.
|
||||
@@ -440,7 +442,7 @@ function makeSwipeDirective(directiveName, direction) {
|
||||
}
|
||||
});
|
||||
|
||||
element.bind('touchend mouseup', function(event) {
|
||||
element.bind('touchend', function(event) {
|
||||
if (validSwipe(event)) {
|
||||
// Prevent this swipe from bubbling up to any other elements with ngSwipes.
|
||||
event.stopPropagation();
|
||||
|
||||
+4
-11
File diff suppressed because one or more lines are too long
@@ -4,6 +4,8 @@ var help = (function () {
|
||||
|
||||
var global = tinymce.util.Tools.resolve('tinymce.PluginManager');
|
||||
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -35,8 +37,6 @@ var help = (function () {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -50,37 +50,27 @@ var help = (function () {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -89,20 +79,16 @@ var help = (function () {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -113,8 +99,8 @@ var help = (function () {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -122,35 +108,31 @@ var help = (function () {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -165,13 +147,16 @@ var help = (function () {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -181,17 +166,11 @@ var help = (function () {
|
||||
};
|
||||
var isFunction = isType('function');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var rawIndexOf = function () {
|
||||
var pIndexOf = Array.prototype.indexOf;
|
||||
var fastIndex = function (xs, x) {
|
||||
return pIndexOf.call(xs, x);
|
||||
};
|
||||
var slowIndex = function (xs, x) {
|
||||
return slowIndexOf(xs, x);
|
||||
};
|
||||
return pIndexOf === undefined ? slowIndex : fastIndex;
|
||||
}();
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var nativeIndexOf = Array.prototype.indexOf;
|
||||
var rawIndexOf = function (ts, t) {
|
||||
return nativeIndexOf.call(ts, t);
|
||||
};
|
||||
var contains = function (xs, x) {
|
||||
return rawIndexOf(xs, x) > -1;
|
||||
};
|
||||
@@ -200,7 +179,7 @@ var help = (function () {
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
@@ -208,7 +187,7 @@ var help = (function () {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
@@ -217,22 +196,14 @@ var help = (function () {
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var slowIndexOf = function (xs, x) {
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (xs[i] === x) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var global$1 = tinymce.util.Tools.resolve('tinymce.util.I18n');
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -67,8 +67,9 @@ var image = (function (domGlobals) {
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
@@ -81,8 +82,9 @@ var image = (function (domGlobals) {
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
@@ -255,17 +257,20 @@ var image = (function (domGlobals) {
|
||||
var baseMerge = function (merger) {
|
||||
return function () {
|
||||
var objects = new Array(arguments.length);
|
||||
for (var i = 0; i < objects.length; i++)
|
||||
for (var i = 0; i < objects.length; i++) {
|
||||
objects[i] = arguments[i];
|
||||
if (objects.length === 0)
|
||||
}
|
||||
if (objects.length === 0) {
|
||||
throw new Error('Can\'t merge zero objects');
|
||||
}
|
||||
var ret = {};
|
||||
for (var j = 0; j < objects.length; j++) {
|
||||
var curObject = objects[j];
|
||||
for (var key in curObject)
|
||||
for (var key in curObject) {
|
||||
if (hasOwnProperty.call(curObject, key)) {
|
||||
ret[key] = merger(ret[key], curObject[key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -24,6 +24,8 @@ var imagetools = (function (domGlobals) {
|
||||
|
||||
var global$1 = tinymce.util.Tools.resolve('tinymce.util.Tools');
|
||||
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -46,8 +48,6 @@ var imagetools = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -61,37 +61,27 @@ var imagetools = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -100,20 +90,16 @@ var imagetools = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -124,8 +110,8 @@ var imagetools = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -133,35 +119,31 @@ var imagetools = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -175,58 +157,6 @@ var imagetools = (function (domGlobals) {
|
||||
from: from
|
||||
};
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
o = o[parts[i]];
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
function SandBlob (parts, properties) {
|
||||
var f = Global$1.getOrDie('Blob');
|
||||
return new f(parts, properties);
|
||||
}
|
||||
|
||||
function FileReader () {
|
||||
var f = Global$1.getOrDie('FileReader');
|
||||
return new f();
|
||||
}
|
||||
|
||||
function Uint8Array (arr) {
|
||||
var f = Global$1.getOrDie('Uint8Array');
|
||||
return new f(arr);
|
||||
}
|
||||
|
||||
var requestAnimationFrame = function (callback) {
|
||||
var f = Global$1.getOrDie('requestAnimationFrame');
|
||||
f(callback);
|
||||
};
|
||||
var atob = function (base64) {
|
||||
var f = Global$1.getOrDie('atob');
|
||||
return f(base64);
|
||||
};
|
||||
var Window = {
|
||||
atob: atob,
|
||||
requestAnimationFrame: requestAnimationFrame
|
||||
};
|
||||
|
||||
function create(width, height) {
|
||||
return resize(domGlobals.document.createElement('canvas'), width, height);
|
||||
}
|
||||
@@ -494,7 +424,7 @@ var imagetools = (function (domGlobals) {
|
||||
var mimetype = matches[1];
|
||||
var base64 = data[1];
|
||||
var sliceSize = 1024;
|
||||
var byteCharacters = Window.atob(base64);
|
||||
var byteCharacters = domGlobals.atob(base64);
|
||||
var bytesLength = byteCharacters.length;
|
||||
var slicesCount = Math.ceil(bytesLength / sliceSize);
|
||||
var byteArrays = new Array(slicesCount);
|
||||
@@ -505,9 +435,9 @@ var imagetools = (function (domGlobals) {
|
||||
for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
|
||||
bytes[i] = byteCharacters[offset].charCodeAt(0);
|
||||
}
|
||||
byteArrays[sliceIndex] = Uint8Array(bytes);
|
||||
byteArrays[sliceIndex] = new Uint8Array(bytes);
|
||||
}
|
||||
return Option.some(SandBlob(byteArrays, { type: mimetype }));
|
||||
return Option.some(new domGlobals.Blob(byteArrays, { type: mimetype }));
|
||||
}
|
||||
function dataUriToBlob(uri) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
@@ -547,7 +477,7 @@ var imagetools = (function (domGlobals) {
|
||||
}
|
||||
function blobToDataUri(blob) {
|
||||
return new Promise(function (resolve) {
|
||||
var reader = FileReader();
|
||||
var reader = new domGlobals.FileReader();
|
||||
reader.onloadend = function () {
|
||||
resolve(reader.result);
|
||||
};
|
||||
@@ -1352,6 +1282,32 @@ var imagetools = (function (domGlobals) {
|
||||
return fromBlob(blob);
|
||||
};
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
var url = function () {
|
||||
return Global$1.getOrDie('URL');
|
||||
};
|
||||
@@ -2592,13 +2548,16 @@ var imagetools = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -2608,20 +2567,25 @@ var imagetools = (function (domGlobals) {
|
||||
};
|
||||
var isFunction = isType('function');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
function FileReader () {
|
||||
var f = Global$1.getOrDie('FileReader');
|
||||
return new f();
|
||||
}
|
||||
|
||||
function XMLHttpRequest () {
|
||||
var f = Global$1.getOrDie('XMLHttpRequest');
|
||||
return new f();
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -204,6 +204,8 @@ var lists = (function (domGlobals) {
|
||||
resolveBookmark: resolveBookmark
|
||||
};
|
||||
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -221,8 +223,6 @@ var lists = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -236,37 +236,27 @@ var lists = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -275,20 +265,16 @@ var lists = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -299,8 +285,8 @@ var lists = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -308,35 +294,31 @@ var lists = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -351,13 +333,16 @@ var lists = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -366,31 +351,33 @@ var lists = (function (domGlobals) {
|
||||
};
|
||||
};
|
||||
var isString = isType('string');
|
||||
var isArray = isType('array');
|
||||
var isBoolean = isType('boolean');
|
||||
var isFunction = isType('function');
|
||||
var isNumber = isType('number');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var nativePush = Array.prototype.push;
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var each = function (xs, f) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var filter = function (xs, pred) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
@@ -428,19 +415,19 @@ var lists = (function (domGlobals) {
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var push = Array.prototype.push;
|
||||
var flatten = function (xs) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (!Array.prototype.isPrototypeOf(xs[i]))
|
||||
if (!isArray(xs[i])) {
|
||||
throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
|
||||
push.apply(r, xs[i]);
|
||||
}
|
||||
nativePush.apply(r, xs[i]);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
@@ -449,7 +436,7 @@ var lists = (function (domGlobals) {
|
||||
return flatten(output);
|
||||
};
|
||||
var reverse = function (xs) {
|
||||
var r = slice.call(xs, 0);
|
||||
var r = nativeSlice.call(xs, 0);
|
||||
r.reverse();
|
||||
return r;
|
||||
};
|
||||
@@ -460,15 +447,16 @@ var lists = (function (domGlobals) {
|
||||
return xs.length === 0 ? Option.none() : Option.some(xs[xs.length - 1]);
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
@@ -481,8 +469,9 @@ var lists = (function (domGlobals) {
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
@@ -613,17 +602,8 @@ var lists = (function (domGlobals) {
|
||||
fromPoint: fromPoint
|
||||
};
|
||||
|
||||
var liftN = function (arr, f) {
|
||||
var r = [];
|
||||
for (var i = 0; i < arr.length; i++) {
|
||||
var x = arr[i];
|
||||
if (x.isSome()) {
|
||||
r.push(x.getOrDie());
|
||||
} else {
|
||||
return Option.none();
|
||||
}
|
||||
}
|
||||
return Option.some(f.apply(null, r));
|
||||
var lift2 = function (oa, ob, f) {
|
||||
return oa.isSome() && ob.isSome() ? Option.some(f(oa.getOrDie(), ob.getOrDie())) : Option.none();
|
||||
};
|
||||
|
||||
var fromElements = function (elements, scope) {
|
||||
@@ -662,7 +642,7 @@ var lists = (function (domGlobals) {
|
||||
for (var k = 0, len = props.length; k < len; k++) {
|
||||
var i = props[k];
|
||||
var x = obj[i];
|
||||
f(x, i, obj);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -703,18 +683,20 @@ var lists = (function (domGlobals) {
|
||||
var firstMatch = function (regexes, s) {
|
||||
for (var i = 0; i < regexes.length; i++) {
|
||||
var x = regexes[i];
|
||||
if (x.test(s))
|
||||
if (x.test(s)) {
|
||||
return x;
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
var find$1 = function (regexes, agent) {
|
||||
var r = firstMatch(regexes, agent);
|
||||
if (!r)
|
||||
if (!r) {
|
||||
return {
|
||||
major: 0,
|
||||
minor: 0
|
||||
};
|
||||
}
|
||||
var group = function (i) {
|
||||
return Number(agent.replace(r, '$' + i));
|
||||
};
|
||||
@@ -722,8 +704,9 @@ var lists = (function (domGlobals) {
|
||||
};
|
||||
var detect = function (versionRegexes, agent) {
|
||||
var cleanedAgent = String(agent).toLowerCase();
|
||||
if (versionRegexes.length === 0)
|
||||
if (versionRegexes.length === 0) {
|
||||
return unknown();
|
||||
}
|
||||
return find$1(versionRegexes, cleanedAgent);
|
||||
};
|
||||
var unknown = function () {
|
||||
@@ -893,8 +876,7 @@ var lists = (function (domGlobals) {
|
||||
name: 'Edge',
|
||||
versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
|
||||
search: function (uastring) {
|
||||
var monstrosity = contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
return monstrosity;
|
||||
return contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1024,19 +1006,22 @@ var lists = (function (domGlobals) {
|
||||
|
||||
var ELEMENT$1 = ELEMENT;
|
||||
var is = function (element, selector) {
|
||||
var elem = element.dom();
|
||||
if (elem.nodeType !== ELEMENT$1) {
|
||||
var dom = element.dom();
|
||||
if (dom.nodeType !== ELEMENT$1) {
|
||||
return false;
|
||||
} else if (elem.matches !== undefined) {
|
||||
return elem.matches(selector);
|
||||
} else if (elem.msMatchesSelector !== undefined) {
|
||||
return elem.msMatchesSelector(selector);
|
||||
} else if (elem.webkitMatchesSelector !== undefined) {
|
||||
return elem.webkitMatchesSelector(selector);
|
||||
} else if (elem.mozMatchesSelector !== undefined) {
|
||||
return elem.mozMatchesSelector(selector);
|
||||
} else {
|
||||
throw new Error('Browser lacks native selectors');
|
||||
var elem = dom;
|
||||
if (elem.matches !== undefined) {
|
||||
return elem.matches(selector);
|
||||
} else if (elem.msMatchesSelector !== undefined) {
|
||||
return elem.msMatchesSelector(selector);
|
||||
} else if (elem.webkitMatchesSelector !== undefined) {
|
||||
return elem.webkitMatchesSelector(selector);
|
||||
} else if (elem.mozMatchesSelector !== undefined) {
|
||||
return elem.mozMatchesSelector(selector);
|
||||
} else {
|
||||
throw new Error('Browser lacks native selectors');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1056,12 +1041,10 @@ var lists = (function (domGlobals) {
|
||||
var is$1 = is;
|
||||
|
||||
var parent = function (element) {
|
||||
var dom = element.dom();
|
||||
return Option.from(dom.parentNode).map(Element.fromDom);
|
||||
return Option.from(element.dom().parentNode).map(Element.fromDom);
|
||||
};
|
||||
var children = function (element) {
|
||||
var dom = element.dom();
|
||||
return map(dom.childNodes, Element.fromDom);
|
||||
return map(element.dom().childNodes, Element.fromDom);
|
||||
};
|
||||
var child = function (element, index) {
|
||||
var cs = element.dom().childNodes;
|
||||
@@ -1107,6 +1090,15 @@ var lists = (function (domGlobals) {
|
||||
var r = element.dom().nodeName;
|
||||
return r.toLowerCase();
|
||||
};
|
||||
var type = function (element) {
|
||||
return element.dom().nodeType;
|
||||
};
|
||||
var isType$1 = function (t) {
|
||||
return function (element) {
|
||||
return type(element) === t;
|
||||
};
|
||||
};
|
||||
var isElement = isType$1(ELEMENT);
|
||||
|
||||
var rawSet = function (dom, key, value) {
|
||||
if (isString(value) || isBoolean(value) || isNumber(value)) {
|
||||
@@ -1177,10 +1169,7 @@ var lists = (function (domGlobals) {
|
||||
}
|
||||
};
|
||||
var appendSegments = function (head$1, tail) {
|
||||
liftN([
|
||||
last(head$1),
|
||||
head(tail)
|
||||
], joinSegment);
|
||||
lift2(last(head$1), head(tail), joinSegment);
|
||||
};
|
||||
var createSegment = function (scope, listType) {
|
||||
var segment = {
|
||||
@@ -1270,7 +1259,7 @@ var lists = (function (domGlobals) {
|
||||
return map(content, deep);
|
||||
};
|
||||
var createEntry = function (li, depth, isSelected) {
|
||||
return parent(li).map(function (list) {
|
||||
return parent(li).filter(isElement).map(function (list) {
|
||||
return {
|
||||
depth: depth,
|
||||
isSelected: isSelected,
|
||||
@@ -1302,17 +1291,20 @@ var lists = (function (domGlobals) {
|
||||
var baseMerge = function (merger) {
|
||||
return function () {
|
||||
var objects = new Array(arguments.length);
|
||||
for (var i = 0; i < objects.length; i++)
|
||||
for (var i = 0; i < objects.length; i++) {
|
||||
objects[i] = arguments[i];
|
||||
if (objects.length === 0)
|
||||
}
|
||||
if (objects.length === 0) {
|
||||
throw new Error('Can\'t merge zero objects');
|
||||
}
|
||||
var ret = {};
|
||||
for (var j = 0; j < objects.length; j++) {
|
||||
var curObject = objects[j];
|
||||
for (var key in curObject)
|
||||
for (var key in curObject) {
|
||||
if (hasOwnProperty.call(curObject, key)) {
|
||||
ret[key] = merger(ret[key], curObject[key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
@@ -1474,10 +1466,7 @@ var lists = (function (domGlobals) {
|
||||
};
|
||||
var getItemSelection = function (editor) {
|
||||
var selectedListItems = map(Selection.getSelectedListItems(editor), Element.fromDom);
|
||||
return liftN([
|
||||
find(selectedListItems, not(hasFirstChildList)),
|
||||
find(reverse(selectedListItems), not(hasFirstChildList))
|
||||
], function (start, end) {
|
||||
return lift2(find(selectedListItems, not(hasFirstChildList)), find(reverse(selectedListItems), not(hasFirstChildList)), function (start, end) {
|
||||
return {
|
||||
start: start,
|
||||
end: end
|
||||
@@ -1529,17 +1518,17 @@ var lists = (function (domGlobals) {
|
||||
var SplitList = { splitList: splitList };
|
||||
|
||||
var outdentDlItem = function (editor, item) {
|
||||
if (is$1(item, 'DD')) {
|
||||
mutate(item, 'DT');
|
||||
} else if (is$1(item, 'DT')) {
|
||||
if (is$1(item, 'dd')) {
|
||||
mutate(item, 'dt');
|
||||
} else if (is$1(item, 'dt')) {
|
||||
parent(item).each(function (dl) {
|
||||
return SplitList.splitList(editor, dl.dom(), item.dom());
|
||||
});
|
||||
}
|
||||
};
|
||||
var indentDlItem = function (item) {
|
||||
if (is$1(item, 'DT')) {
|
||||
mutate(item, 'DD');
|
||||
if (is$1(item, 'dt')) {
|
||||
mutate(item, 'dd');
|
||||
}
|
||||
};
|
||||
var dlIndentation = function (editor, indentation, dlItems) {
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -47,9 +47,154 @@ var media = (function () {
|
||||
hasDimensions: hasDimensions
|
||||
};
|
||||
|
||||
var global$3 = tinymce.util.Tools.resolve('tinymce.html.SaxParser');
|
||||
var Cell = function (initial) {
|
||||
var value = initial;
|
||||
var get = function () {
|
||||
return value;
|
||||
};
|
||||
var set = function (v) {
|
||||
value = v;
|
||||
};
|
||||
var clone = function () {
|
||||
return Cell(get());
|
||||
};
|
||||
return {
|
||||
get: get,
|
||||
set: set,
|
||||
clone: clone
|
||||
};
|
||||
};
|
||||
|
||||
var global$4 = tinymce.util.Tools.resolve('tinymce.dom.DOMUtils');
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
};
|
||||
};
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
var NONE = function () {
|
||||
var eq = function (o) {
|
||||
return o.isNone();
|
||||
};
|
||||
var call = function (thunk) {
|
||||
return thunk();
|
||||
};
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
toArray: function () {
|
||||
return [];
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return s(a);
|
||||
},
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
getOrNull: constant_a,
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
};
|
||||
var from = function (value) {
|
||||
return value === null || value === undefined ? NONE : some(value);
|
||||
};
|
||||
var Option = {
|
||||
some: some,
|
||||
none: none,
|
||||
from: from
|
||||
};
|
||||
|
||||
var hasOwnProperty = Object.hasOwnProperty;
|
||||
var get = function (obj, key) {
|
||||
return has(obj, key) ? Option.from(obj[key]) : Option.none();
|
||||
};
|
||||
var has = function (obj, key) {
|
||||
return hasOwnProperty.call(obj, key);
|
||||
};
|
||||
|
||||
var global$3 = tinymce.util.Tools.resolve('tinymce.dom.DOMUtils');
|
||||
|
||||
var global$4 = tinymce.util.Tools.resolve('tinymce.html.SaxParser');
|
||||
|
||||
var getVideoScriptMatch = function (prefixes, src) {
|
||||
if (prefixes) {
|
||||
@@ -62,76 +207,65 @@ var media = (function () {
|
||||
};
|
||||
var VideoScript = { getVideoScriptMatch: getVideoScriptMatch };
|
||||
|
||||
var DOM = global$3.DOM;
|
||||
var trimPx = function (value) {
|
||||
return value.replace(/px$/, '');
|
||||
};
|
||||
var addPx = function (value) {
|
||||
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
|
||||
};
|
||||
var getSize = function (name) {
|
||||
return function (elm) {
|
||||
return elm ? trimPx(elm.style[name]) : '';
|
||||
var getEphoxEmbedData = function (attrs) {
|
||||
var style = attrs.map.style;
|
||||
var styles = style ? DOM.parseStyle(style) : {};
|
||||
return {
|
||||
type: 'ephox-embed-iri',
|
||||
source1: attrs.map['data-ephox-embed-iri'],
|
||||
source2: '',
|
||||
poster: '',
|
||||
width: get(styles, 'max-width').map(trimPx).getOr(''),
|
||||
height: get(styles, 'max-height').map(trimPx).getOr('')
|
||||
};
|
||||
};
|
||||
var setSize = function (name) {
|
||||
return function (elm, value) {
|
||||
if (elm) {
|
||||
elm.style[name] = addPx(value);
|
||||
}
|
||||
};
|
||||
};
|
||||
var Size = {
|
||||
getMaxWidth: getSize('maxWidth'),
|
||||
getMaxHeight: getSize('maxHeight'),
|
||||
setMaxWidth: setSize('maxWidth'),
|
||||
setMaxHeight: setSize('maxHeight')
|
||||
};
|
||||
|
||||
var DOM = global$4.DOM;
|
||||
var getEphoxEmbedIri = function (elm) {
|
||||
return DOM.getAttrib(elm, 'data-ephox-embed-iri');
|
||||
};
|
||||
var isEphoxEmbed = function (html) {
|
||||
var fragment = DOM.createFragment(html);
|
||||
return getEphoxEmbedIri(fragment.firstChild) !== '';
|
||||
};
|
||||
var htmlToDataSax = function (prefixes, html) {
|
||||
var htmlToData = function (prefixes, html) {
|
||||
var isEphoxEmbed = Cell(false);
|
||||
var data = {};
|
||||
global$3({
|
||||
global$4({
|
||||
validate: false,
|
||||
allow_conditional_comments: true,
|
||||
special: 'script,noscript',
|
||||
start: function (name, attrs) {
|
||||
if (!data.source1 && name === 'param') {
|
||||
data.source1 = attrs.map.movie;
|
||||
}
|
||||
if (name === 'iframe' || name === 'object' || name === 'embed' || name === 'video' || name === 'audio') {
|
||||
if (!data.type) {
|
||||
data.type = name;
|
||||
if (isEphoxEmbed.get()) ; else if (has(attrs.map, 'data-ephox-embed-iri')) {
|
||||
isEphoxEmbed.set(true);
|
||||
data = getEphoxEmbedData(attrs);
|
||||
} else {
|
||||
if (!data.source1 && name === 'param') {
|
||||
data.source1 = attrs.map.movie;
|
||||
}
|
||||
data = global$2.extend(attrs.map, data);
|
||||
}
|
||||
if (name === 'script') {
|
||||
var videoScript = VideoScript.getVideoScriptMatch(prefixes, attrs.map.src);
|
||||
if (!videoScript) {
|
||||
return;
|
||||
if (name === 'iframe' || name === 'object' || name === 'embed' || name === 'video' || name === 'audio') {
|
||||
if (!data.type) {
|
||||
data.type = name;
|
||||
}
|
||||
data = global$2.extend(attrs.map, data);
|
||||
}
|
||||
data = {
|
||||
type: 'script',
|
||||
source1: attrs.map.src,
|
||||
width: videoScript.width,
|
||||
height: videoScript.height
|
||||
};
|
||||
}
|
||||
if (name === 'source') {
|
||||
if (!data.source1) {
|
||||
data.source1 = attrs.map.src;
|
||||
} else if (!data.source2) {
|
||||
data.source2 = attrs.map.src;
|
||||
if (name === 'script') {
|
||||
var videoScript = VideoScript.getVideoScriptMatch(prefixes, attrs.map.src);
|
||||
if (!videoScript) {
|
||||
return;
|
||||
}
|
||||
data = {
|
||||
type: 'script',
|
||||
source1: attrs.map.src,
|
||||
width: videoScript.width,
|
||||
height: videoScript.height
|
||||
};
|
||||
}
|
||||
if (name === 'source') {
|
||||
if (!data.source1) {
|
||||
data.source1 = attrs.map.src;
|
||||
} else if (!data.source2) {
|
||||
data.source2 = attrs.map.src;
|
||||
}
|
||||
}
|
||||
if (name === 'img' && !data.poster) {
|
||||
data.poster = attrs.map.src;
|
||||
}
|
||||
}
|
||||
if (name === 'img' && !data.poster) {
|
||||
data.poster = attrs.map.src;
|
||||
}
|
||||
}
|
||||
}).parse(html);
|
||||
@@ -140,21 +274,6 @@ var media = (function () {
|
||||
data.poster = data.poster || '';
|
||||
return data;
|
||||
};
|
||||
var ephoxEmbedHtmlToData = function (html) {
|
||||
var fragment = DOM.createFragment(html);
|
||||
var div = fragment.firstChild;
|
||||
return {
|
||||
type: 'ephox-embed-iri',
|
||||
source1: getEphoxEmbedIri(div),
|
||||
source2: '',
|
||||
poster: '',
|
||||
width: Size.getMaxWidth(div),
|
||||
height: Size.getMaxHeight(div)
|
||||
};
|
||||
};
|
||||
var htmlToData = function (prefixes, html) {
|
||||
return isEphoxEmbed(html) ? ephoxEmbedHtmlToData(html) : htmlToDataSax(prefixes, html);
|
||||
};
|
||||
var HtmlToData = { htmlToData: htmlToData };
|
||||
|
||||
var global$5 = tinymce.util.Tools.resolve('tinymce.util.Promise');
|
||||
@@ -174,22 +293,21 @@ var media = (function () {
|
||||
};
|
||||
var Mime = { guess: guess };
|
||||
|
||||
var global$6 = tinymce.util.Tools.resolve('tinymce.html.Writer');
|
||||
var global$6 = tinymce.util.Tools.resolve('tinymce.html.Schema');
|
||||
|
||||
var global$7 = tinymce.util.Tools.resolve('tinymce.html.Schema');
|
||||
var global$7 = tinymce.util.Tools.resolve('tinymce.html.Writer');
|
||||
|
||||
var DOM$1 = global$4.DOM;
|
||||
var DOM$1 = global$3.DOM;
|
||||
var addPx = function (value) {
|
||||
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
|
||||
};
|
||||
var setAttributes = function (attrs, updatedAttrs) {
|
||||
var name;
|
||||
var i;
|
||||
var value;
|
||||
var attr;
|
||||
for (name in updatedAttrs) {
|
||||
value = '' + updatedAttrs[name];
|
||||
for (var name in updatedAttrs) {
|
||||
var value = '' + updatedAttrs[name];
|
||||
if (attrs.map[name]) {
|
||||
i = attrs.length;
|
||||
var i = attrs.length;
|
||||
while (i--) {
|
||||
attr = attrs[i];
|
||||
var attr = attrs[i];
|
||||
if (attr.name === name) {
|
||||
if (value) {
|
||||
attrs.map[name] = value;
|
||||
@@ -209,17 +327,19 @@ var media = (function () {
|
||||
}
|
||||
}
|
||||
};
|
||||
var normalizeHtml = function (html) {
|
||||
var writer = global$6();
|
||||
var parser = global$3(writer);
|
||||
parser.parse(html);
|
||||
return writer.getContent();
|
||||
var updateEphoxEmbed = function (data, attrs) {
|
||||
var style = attrs.map.style;
|
||||
var styleMap = style ? DOM$1.parseStyle(style) : {};
|
||||
styleMap['max-width'] = addPx(data.width);
|
||||
styleMap['max-height'] = addPx(data.height);
|
||||
setAttributes(attrs, { style: DOM$1.serializeStyle(styleMap) });
|
||||
};
|
||||
var updateHtmlSax = function (html, data, updateAll) {
|
||||
var writer = global$6();
|
||||
var updateHtml = function (html, data, updateAll) {
|
||||
var writer = global$7();
|
||||
var isEphoxEmbed = Cell(false);
|
||||
var sourceCount = 0;
|
||||
var hasImage;
|
||||
global$3({
|
||||
global$4({
|
||||
validate: false,
|
||||
allow_conditional_comments: true,
|
||||
special: 'script,noscript',
|
||||
@@ -233,101 +353,94 @@ var media = (function () {
|
||||
writer.text(text, raw);
|
||||
},
|
||||
start: function (name, attrs, empty) {
|
||||
switch (name) {
|
||||
case 'video':
|
||||
case 'object':
|
||||
case 'embed':
|
||||
case 'img':
|
||||
case 'iframe':
|
||||
if (data.height !== undefined && data.width !== undefined) {
|
||||
setAttributes(attrs, {
|
||||
width: data.width,
|
||||
height: data.height
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (updateAll) {
|
||||
if (isEphoxEmbed.get()) ; else if (has(attrs.map, 'data-ephox-embed-iri')) {
|
||||
isEphoxEmbed.set(true);
|
||||
updateEphoxEmbed(data, attrs);
|
||||
} else {
|
||||
switch (name) {
|
||||
case 'video':
|
||||
setAttributes(attrs, {
|
||||
poster: data.poster,
|
||||
src: ''
|
||||
});
|
||||
if (data.source2) {
|
||||
setAttributes(attrs, { src: '' });
|
||||
case 'object':
|
||||
case 'embed':
|
||||
case 'img':
|
||||
case 'iframe':
|
||||
if (data.height !== undefined && data.width !== undefined) {
|
||||
setAttributes(attrs, {
|
||||
width: data.width,
|
||||
height: data.height
|
||||
});
|
||||
}
|
||||
break;
|
||||
case 'iframe':
|
||||
setAttributes(attrs, { src: data.source1 });
|
||||
break;
|
||||
case 'source':
|
||||
sourceCount++;
|
||||
if (sourceCount <= 2) {
|
||||
}
|
||||
if (updateAll) {
|
||||
switch (name) {
|
||||
case 'video':
|
||||
setAttributes(attrs, {
|
||||
src: data['source' + sourceCount],
|
||||
type: data['source' + sourceCount + 'mime']
|
||||
poster: data.poster,
|
||||
src: ''
|
||||
});
|
||||
if (!data['source' + sourceCount]) {
|
||||
if (data.source2) {
|
||||
setAttributes(attrs, { src: '' });
|
||||
}
|
||||
break;
|
||||
case 'iframe':
|
||||
setAttributes(attrs, { src: data.source1 });
|
||||
break;
|
||||
case 'source':
|
||||
sourceCount++;
|
||||
if (sourceCount <= 2) {
|
||||
setAttributes(attrs, {
|
||||
src: data['source' + sourceCount],
|
||||
type: data['source' + sourceCount + 'mime']
|
||||
});
|
||||
if (!data['source' + sourceCount]) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'img':
|
||||
if (!data.poster) {
|
||||
return;
|
||||
}
|
||||
hasImage = true;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'img':
|
||||
if (!data.poster) {
|
||||
return;
|
||||
}
|
||||
hasImage = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
writer.start(name, attrs, empty);
|
||||
},
|
||||
end: function (name) {
|
||||
if (name === 'video' && updateAll) {
|
||||
for (var index = 1; index <= 2; index++) {
|
||||
if (data['source' + index]) {
|
||||
var attrs = [];
|
||||
attrs.map = {};
|
||||
if (sourceCount < index) {
|
||||
setAttributes(attrs, {
|
||||
src: data['source' + index],
|
||||
type: data['source' + index + 'mime']
|
||||
});
|
||||
writer.start('source', attrs, true);
|
||||
if (!isEphoxEmbed.get()) {
|
||||
if (name === 'video' && updateAll) {
|
||||
for (var index = 1; index <= 2; index++) {
|
||||
if (data['source' + index]) {
|
||||
var attrs = [];
|
||||
attrs.map = {};
|
||||
if (sourceCount < index) {
|
||||
setAttributes(attrs, {
|
||||
src: data['source' + index],
|
||||
type: data['source' + index + 'mime']
|
||||
});
|
||||
writer.start('source', attrs, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (data.poster && name === 'object' && updateAll && !hasImage) {
|
||||
var imgAttrs = [];
|
||||
imgAttrs.map = {};
|
||||
setAttributes(imgAttrs, {
|
||||
src: data.poster,
|
||||
width: data.width,
|
||||
height: data.height
|
||||
});
|
||||
writer.start('img', imgAttrs, true);
|
||||
if (data.poster && name === 'object' && updateAll && !hasImage) {
|
||||
var imgAttrs = [];
|
||||
imgAttrs.map = {};
|
||||
setAttributes(imgAttrs, {
|
||||
src: data.poster,
|
||||
width: data.width,
|
||||
height: data.height
|
||||
});
|
||||
writer.start('img', imgAttrs, true);
|
||||
}
|
||||
}
|
||||
writer.end(name);
|
||||
}
|
||||
}, global$7({})).parse(html);
|
||||
}, global$6({})).parse(html);
|
||||
return writer.getContent();
|
||||
};
|
||||
var isEphoxEmbed$1 = function (html) {
|
||||
var fragment = DOM$1.createFragment(html);
|
||||
return DOM$1.getAttrib(fragment.firstChild, 'data-ephox-embed-iri') !== '';
|
||||
};
|
||||
var updateEphoxEmbed = function (html, data) {
|
||||
var fragment = DOM$1.createFragment(html);
|
||||
var div = fragment.firstChild;
|
||||
Size.setMaxWidth(div, data.width);
|
||||
Size.setMaxHeight(div, data.height);
|
||||
return normalizeHtml(div.outerHTML);
|
||||
};
|
||||
var updateHtml = function (html, data, updateAll) {
|
||||
return isEphoxEmbed$1(html) ? updateEphoxEmbed(html, data) : updateHtmlSax(html, data, updateAll);
|
||||
};
|
||||
var UpdateHtml = { updateHtml: updateHtml };
|
||||
|
||||
var urlPatterns = [
|
||||
@@ -551,6 +664,31 @@ var media = (function () {
|
||||
isCached: isCached
|
||||
};
|
||||
|
||||
var trimPx$1 = function (value) {
|
||||
return value.replace(/px$/, '');
|
||||
};
|
||||
var addPx$1 = function (value) {
|
||||
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
|
||||
};
|
||||
var getSize = function (name) {
|
||||
return function (elm) {
|
||||
return elm ? trimPx$1(elm.style[name]) : '';
|
||||
};
|
||||
};
|
||||
var setSize = function (name) {
|
||||
return function (elm, value) {
|
||||
if (elm) {
|
||||
elm.style[name] = addPx$1(value);
|
||||
}
|
||||
};
|
||||
};
|
||||
var Size = {
|
||||
getMaxWidth: getSize('maxWidth'),
|
||||
getMaxHeight: getSize('maxHeight'),
|
||||
setMaxWidth: setSize('maxWidth'),
|
||||
setMaxHeight: setSize('maxHeight')
|
||||
};
|
||||
|
||||
var doSyncSize = function (widthCtrl, heightCtrl) {
|
||||
widthCtrl.state.set('oldVal', widthCtrl.value());
|
||||
heightCtrl.state.set('oldVal', heightCtrl.value());
|
||||
@@ -825,13 +963,13 @@ var media = (function () {
|
||||
};
|
||||
var Dialog = { showDialog: showDialog };
|
||||
|
||||
var get = function (editor) {
|
||||
var get$1 = function (editor) {
|
||||
var showDialog = function () {
|
||||
Dialog.showDialog(editor);
|
||||
};
|
||||
return { showDialog: showDialog };
|
||||
};
|
||||
var Api = { get: get };
|
||||
var Api = { get: get$1 };
|
||||
|
||||
var register = function (editor) {
|
||||
var showDialog = function () {
|
||||
@@ -847,9 +985,9 @@ var media = (function () {
|
||||
if (Settings.shouldFilterHtml(editor) === false) {
|
||||
return html;
|
||||
}
|
||||
var writer = global$6();
|
||||
var writer = global$7();
|
||||
var blocked;
|
||||
global$3({
|
||||
global$4({
|
||||
validate: false,
|
||||
allow_conditional_comments: false,
|
||||
special: 'script,noscript',
|
||||
@@ -864,14 +1002,16 @@ var media = (function () {
|
||||
},
|
||||
start: function (name, attrs, empty) {
|
||||
blocked = true;
|
||||
if (name === 'script' || name === 'noscript') {
|
||||
if (name === 'script' || name === 'noscript' || name === 'svg') {
|
||||
return;
|
||||
}
|
||||
for (var i = 0; i < attrs.length; i++) {
|
||||
if (attrs[i].name.indexOf('on') === 0) {
|
||||
return;
|
||||
for (var i = attrs.length - 1; i >= 0; i--) {
|
||||
var attrName = attrs[i].name;
|
||||
if (attrName.indexOf('on') === 0) {
|
||||
delete attrs.map[attrName];
|
||||
attrs.splice(i, 1);
|
||||
}
|
||||
if (attrs[i].name === 'style') {
|
||||
if (attrName === 'style') {
|
||||
attrs[i].value = editor.dom.serializeStyle(editor.dom.parseStyle(attrs[i].value), name);
|
||||
}
|
||||
}
|
||||
@@ -884,7 +1024,7 @@ var media = (function () {
|
||||
}
|
||||
writer.end(name);
|
||||
}
|
||||
}, global$7({})).parse(html);
|
||||
}, global$6({})).parse(html);
|
||||
return writer.getContent();
|
||||
};
|
||||
var Sanitize = { sanitize: sanitize };
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
+1
-1
File diff suppressed because one or more lines are too long
@@ -51,14 +51,9 @@ var table = (function (domGlobals) {
|
||||
throw new Error(msg);
|
||||
};
|
||||
};
|
||||
var apply = function (f) {
|
||||
return f();
|
||||
};
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -72,37 +67,27 @@ var table = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -111,20 +96,16 @@ var table = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -135,8 +116,8 @@ var table = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -144,35 +125,31 @@ var table = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -187,13 +164,16 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -207,49 +187,50 @@ var table = (function (domGlobals) {
|
||||
var isFunction = isType('function');
|
||||
var isNumber = isType('number');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var rawIndexOf = function () {
|
||||
var pIndexOf = Array.prototype.indexOf;
|
||||
var fastIndex = function (xs, x) {
|
||||
return pIndexOf.call(xs, x);
|
||||
};
|
||||
var slowIndex = function (xs, x) {
|
||||
return slowIndexOf(xs, x);
|
||||
};
|
||||
return pIndexOf === undefined ? slowIndex : fastIndex;
|
||||
}();
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var nativeIndexOf = Array.prototype.indexOf;
|
||||
var nativePush = Array.prototype.push;
|
||||
var rawIndexOf = function (ts, t) {
|
||||
return nativeIndexOf.call(ts, t);
|
||||
};
|
||||
var contains = function (xs, x) {
|
||||
return rawIndexOf(xs, x) > -1;
|
||||
};
|
||||
var exists = function (xs, pred) {
|
||||
return findIndex(xs, pred).isSome();
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var each = function (xs, f) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var eachr = function (xs, f) {
|
||||
for (var i = xs.length - 1; i >= 0; i--) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var filter = function (xs, pred) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
@@ -270,7 +251,7 @@ var table = (function (domGlobals) {
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
@@ -279,27 +260,19 @@ var table = (function (domGlobals) {
|
||||
var findIndex = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(i);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var slowIndexOf = function (xs, x) {
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (xs[i] === x) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
var push = Array.prototype.push;
|
||||
var flatten = function (xs) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (!Array.prototype.isPrototypeOf(xs[i]))
|
||||
if (!isArray(xs[i])) {
|
||||
throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
|
||||
push.apply(r, xs[i]);
|
||||
}
|
||||
nativePush.apply(r, xs[i]);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
@@ -310,14 +283,14 @@ var table = (function (domGlobals) {
|
||||
var forall = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs) !== true) {
|
||||
if (pred(x, i) !== true) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
var reverse = function (xs) {
|
||||
var r = slice.call(xs, 0);
|
||||
var r = nativeSlice.call(xs, 0);
|
||||
r.reverse();
|
||||
return r;
|
||||
};
|
||||
@@ -325,7 +298,7 @@ var table = (function (domGlobals) {
|
||||
return xs.length === 0 ? Option.none() : Option.some(xs[xs.length - 1]);
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var keys = Object.keys;
|
||||
@@ -334,21 +307,21 @@ var table = (function (domGlobals) {
|
||||
for (var k = 0, len = props.length; k < len; k++) {
|
||||
var i = props[k];
|
||||
var x = obj[i];
|
||||
f(x, i, obj);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var map$1 = function (obj, f) {
|
||||
return tupleMap(obj, function (x, i, obj) {
|
||||
return tupleMap(obj, function (x, i) {
|
||||
return {
|
||||
k: i,
|
||||
v: f(x, i, obj)
|
||||
v: f(x, i)
|
||||
};
|
||||
});
|
||||
};
|
||||
var tupleMap = function (obj, f) {
|
||||
var r = {};
|
||||
each$1(obj, function (x, i) {
|
||||
var tuple = f(x, i, obj);
|
||||
var tuple = f(x, i);
|
||||
r[tuple.k] = tuple.v;
|
||||
});
|
||||
return r;
|
||||
@@ -385,11 +358,13 @@ var table = (function (domGlobals) {
|
||||
throw new Error('Unsupported keys for object: ' + sort(unsupported).join(', '));
|
||||
};
|
||||
var validateStrArr = function (label, array) {
|
||||
if (!isArray(array))
|
||||
if (!isArray(array)) {
|
||||
throw new Error('The ' + label + ' fields must be an array. Was: ' + array + '.');
|
||||
}
|
||||
each(array, function (a) {
|
||||
if (!isString(a))
|
||||
if (!isString(a)) {
|
||||
throw new Error('The value ' + a + ' in the ' + label + ' fields was not a string.');
|
||||
}
|
||||
});
|
||||
};
|
||||
var invalidTypeMessage = function (incorrect, type) {
|
||||
@@ -407,8 +382,9 @@ var table = (function (domGlobals) {
|
||||
|
||||
var MixedBag = function (required, optional) {
|
||||
var everything = required.concat(optional);
|
||||
if (everything.length === 0)
|
||||
if (everything.length === 0) {
|
||||
throw new Error('You must specify at least one required or optional field.');
|
||||
}
|
||||
validateStrArr('required', required);
|
||||
validateStrArr('optional', optional);
|
||||
checkDupes(everything);
|
||||
@@ -417,13 +393,15 @@ var table = (function (domGlobals) {
|
||||
var allReqd = forall(required, function (req) {
|
||||
return contains(keys$1, req);
|
||||
});
|
||||
if (!allReqd)
|
||||
if (!allReqd) {
|
||||
reqMessage(required, keys$1);
|
||||
}
|
||||
var unsupported = filter(keys$1, function (key) {
|
||||
return !contains(everything, key);
|
||||
});
|
||||
if (unsupported.length > 0)
|
||||
if (unsupported.length > 0) {
|
||||
unsuppMessage(unsupported);
|
||||
}
|
||||
var r = {};
|
||||
each(required, function (req) {
|
||||
r[req] = constant(obj[req]);
|
||||
@@ -448,6 +426,32 @@ var table = (function (domGlobals) {
|
||||
var ENTITY = domGlobals.Node.ENTITY_NODE;
|
||||
var NOTATION = domGlobals.Node.NOTATION_NODE;
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
var name = function (element) {
|
||||
var r = element.dom().nodeName;
|
||||
return r.toLowerCase();
|
||||
@@ -465,7 +469,6 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
var isElement = isType$1(ELEMENT);
|
||||
var isText = isType$1(TEXT);
|
||||
var isDocument = isType$1(DOCUMENT);
|
||||
|
||||
var rawSet = function (dom, key, value) {
|
||||
if (isString(value) || isBoolean(value) || isNumber(value)) {
|
||||
@@ -503,10 +506,12 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var checkRange = function (str, substr, start) {
|
||||
if (substr === '')
|
||||
if (substr === '') {
|
||||
return true;
|
||||
if (str.length < substr.length)
|
||||
}
|
||||
if (str.length < substr.length) {
|
||||
return false;
|
||||
}
|
||||
var x = str.substr(start, start + substr.length);
|
||||
return x === substr;
|
||||
};
|
||||
@@ -649,30 +654,6 @@ var table = (function (domGlobals) {
|
||||
}
|
||||
};
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
o = o[parts[i]];
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
var node = function () {
|
||||
var f = Global$1.getOrDie('Node');
|
||||
return f;
|
||||
@@ -694,18 +675,20 @@ var table = (function (domGlobals) {
|
||||
var firstMatch = function (regexes, s) {
|
||||
for (var i = 0; i < regexes.length; i++) {
|
||||
var x = regexes[i];
|
||||
if (x.test(s))
|
||||
if (x.test(s)) {
|
||||
return x;
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
var find$1 = function (regexes, agent) {
|
||||
var r = firstMatch(regexes, agent);
|
||||
if (!r)
|
||||
if (!r) {
|
||||
return {
|
||||
major: 0,
|
||||
minor: 0
|
||||
};
|
||||
}
|
||||
var group = function (i) {
|
||||
return Number(agent.replace(r, '$' + i));
|
||||
};
|
||||
@@ -713,8 +696,9 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
var detect = function (versionRegexes, agent) {
|
||||
var cleanedAgent = String(agent).toLowerCase();
|
||||
if (versionRegexes.length === 0)
|
||||
if (versionRegexes.length === 0) {
|
||||
return unknown();
|
||||
}
|
||||
return find$1(versionRegexes, cleanedAgent);
|
||||
};
|
||||
var unknown = function () {
|
||||
@@ -880,8 +864,7 @@ var table = (function (domGlobals) {
|
||||
name: 'Edge',
|
||||
versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
|
||||
search: function (uastring) {
|
||||
var monstrosity = contains$1(uastring, 'edge/') && contains$1(uastring, 'chrome') && contains$1(uastring, 'safari') && contains$1(uastring, 'applewebkit');
|
||||
return monstrosity;
|
||||
return contains$1(uastring, 'edge/') && contains$1(uastring, 'chrome') && contains$1(uastring, 'safari') && contains$1(uastring, 'applewebkit');
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -999,19 +982,22 @@ var table = (function (domGlobals) {
|
||||
var ELEMENT$1 = ELEMENT;
|
||||
var DOCUMENT$1 = DOCUMENT;
|
||||
var is = function (element, selector) {
|
||||
var elem = element.dom();
|
||||
if (elem.nodeType !== ELEMENT$1) {
|
||||
var dom = element.dom();
|
||||
if (dom.nodeType !== ELEMENT$1) {
|
||||
return false;
|
||||
} else if (elem.matches !== undefined) {
|
||||
return elem.matches(selector);
|
||||
} else if (elem.msMatchesSelector !== undefined) {
|
||||
return elem.msMatchesSelector(selector);
|
||||
} else if (elem.webkitMatchesSelector !== undefined) {
|
||||
return elem.webkitMatchesSelector(selector);
|
||||
} else if (elem.mozMatchesSelector !== undefined) {
|
||||
return elem.mozMatchesSelector(selector);
|
||||
} else {
|
||||
throw new Error('Browser lacks native selectors');
|
||||
var elem = dom;
|
||||
if (elem.matches !== undefined) {
|
||||
return elem.matches(selector);
|
||||
} else if (elem.msMatchesSelector !== undefined) {
|
||||
return elem.msMatchesSelector(selector);
|
||||
} else if (elem.webkitMatchesSelector !== undefined) {
|
||||
return elem.webkitMatchesSelector(selector);
|
||||
} else if (elem.mozMatchesSelector !== undefined) {
|
||||
return elem.mozMatchesSelector(selector);
|
||||
} else {
|
||||
throw new Error('Browser lacks native selectors');
|
||||
}
|
||||
}
|
||||
};
|
||||
var bypassSelector = function (dom) {
|
||||
@@ -1045,16 +1031,13 @@ var table = (function (domGlobals) {
|
||||
return Element.fromDom(element.dom().ownerDocument);
|
||||
};
|
||||
var defaultView = function (element) {
|
||||
var el = element.dom();
|
||||
var defView = el.ownerDocument.defaultView;
|
||||
return Element.fromDom(defView);
|
||||
return Element.fromDom(element.dom().ownerDocument.defaultView);
|
||||
};
|
||||
var parent = function (element) {
|
||||
var dom = element.dom();
|
||||
return Option.from(dom.parentNode).map(Element.fromDom);
|
||||
return Option.from(element.dom().parentNode).map(Element.fromDom);
|
||||
};
|
||||
var parents = function (element, isRoot) {
|
||||
var stop = isFunction(isRoot) ? isRoot : constant(false);
|
||||
var stop = isFunction(isRoot) ? isRoot : never;
|
||||
var dom = element.dom();
|
||||
var ret = [];
|
||||
while (dom.parentNode !== null && dom.parentNode !== undefined) {
|
||||
@@ -1070,16 +1053,13 @@ var table = (function (domGlobals) {
|
||||
return ret;
|
||||
};
|
||||
var prevSibling = function (element) {
|
||||
var dom = element.dom();
|
||||
return Option.from(dom.previousSibling).map(Element.fromDom);
|
||||
return Option.from(element.dom().previousSibling).map(Element.fromDom);
|
||||
};
|
||||
var nextSibling = function (element) {
|
||||
var dom = element.dom();
|
||||
return Option.from(dom.nextSibling).map(Element.fromDom);
|
||||
return Option.from(element.dom().nextSibling).map(Element.fromDom);
|
||||
};
|
||||
var children = function (element) {
|
||||
var dom = element.dom();
|
||||
return map(dom.childNodes, Element.fromDom);
|
||||
return map(element.dom().childNodes, Element.fromDom);
|
||||
};
|
||||
var child = function (element, index) {
|
||||
var cs = element.dom().childNodes;
|
||||
@@ -1225,20 +1205,24 @@ var table = (function (domGlobals) {
|
||||
return Option.none();
|
||||
};
|
||||
var closest = function (scope, predicate, isRoot) {
|
||||
var is = function (s) {
|
||||
return predicate(s);
|
||||
var is = function (s, test) {
|
||||
return test(s);
|
||||
};
|
||||
return ClosestOrAncestor(is, ancestor, scope, predicate, isRoot);
|
||||
};
|
||||
var child$1 = function (scope, predicate) {
|
||||
var result = find(scope.dom().childNodes, compose(predicate, Element.fromDom));
|
||||
var pred = function (node) {
|
||||
return predicate(Element.fromDom(node));
|
||||
};
|
||||
var result = find(scope.dom().childNodes, pred);
|
||||
return result.map(Element.fromDom);
|
||||
};
|
||||
var descendant = function (scope, predicate) {
|
||||
var descend = function (node) {
|
||||
for (var i = 0; i < node.childNodes.length; i++) {
|
||||
if (predicate(Element.fromDom(node.childNodes[i]))) {
|
||||
return Option.some(Element.fromDom(node.childNodes[i]));
|
||||
var child_1 = Element.fromDom(node.childNodes[i]);
|
||||
if (predicate(child_1)) {
|
||||
return Option.some(child_1);
|
||||
}
|
||||
var res = descend(node.childNodes[i]);
|
||||
if (res.isSome()) {
|
||||
@@ -1545,18 +1529,9 @@ var table = (function (domGlobals) {
|
||||
}
|
||||
return getOption(element).getOr('');
|
||||
};
|
||||
var getOptionIE10 = function (element) {
|
||||
try {
|
||||
return getOptionSafe(element);
|
||||
} catch (e) {
|
||||
return Option.none();
|
||||
}
|
||||
};
|
||||
var getOptionSafe = function (element) {
|
||||
var getOption = function (element) {
|
||||
return is(element) ? Option.from(element.dom().nodeValue) : Option.none();
|
||||
};
|
||||
var browser = PlatformDetection$1.detect().browser;
|
||||
var getOption = browser.isIE() && browser.version.major === 10 ? getOptionIE10 : getOptionSafe;
|
||||
var set = function (element, value) {
|
||||
if (!is(element)) {
|
||||
throw new Error('Can only set raw ' + name + ' value of a ' + name + ' node');
|
||||
@@ -1902,15 +1877,18 @@ var table = (function (domGlobals) {
|
||||
return element.dom().ownerDocument;
|
||||
};
|
||||
var isBoundary = function (element) {
|
||||
if (!isElement(element))
|
||||
if (!isElement(element)) {
|
||||
return false;
|
||||
if (name(element) === 'body')
|
||||
}
|
||||
if (name(element) === 'body') {
|
||||
return true;
|
||||
}
|
||||
return contains(TagBoundaries, name(element));
|
||||
};
|
||||
var isEmptyTag = function (element) {
|
||||
if (!isElement(element))
|
||||
if (!isElement(element)) {
|
||||
return false;
|
||||
}
|
||||
return contains([
|
||||
'br',
|
||||
'img',
|
||||
@@ -2359,8 +2337,9 @@ var table = (function (domGlobals) {
|
||||
throw new Error('Wrong number of arguments to case ' + key + '. Expected ' + value.length + ' (' + value + '), got ' + argLength);
|
||||
}
|
||||
var args = new Array(argLength);
|
||||
for (var i = 0; i < args.length; i++)
|
||||
for (var i = 0; i < args.length; i++) {
|
||||
args[i] = arguments[i];
|
||||
}
|
||||
var match = function (branches) {
|
||||
var branchKeys = keys(branches);
|
||||
if (constructors.length !== branchKeys.length) {
|
||||
@@ -2369,8 +2348,9 @@ var table = (function (domGlobals) {
|
||||
var allReqd = forall(constructors, function (reqKey) {
|
||||
return contains(branchKeys, reqKey);
|
||||
});
|
||||
if (!allReqd)
|
||||
if (!allReqd) {
|
||||
throw new Error('Not all branches were specified when using match. Specified: ' + branchKeys.join(', ') + '\nRequired: ' + constructors.join(', '));
|
||||
}
|
||||
return branches[key].apply(null, args);
|
||||
};
|
||||
return {
|
||||
@@ -2765,18 +2745,6 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
var CellMutations = { halve: halve };
|
||||
|
||||
var attached = function (element, scope) {
|
||||
var doc = scope || Element.fromDom(domGlobals.document.documentElement);
|
||||
return ancestor(element, curry(eq, doc)).isSome();
|
||||
};
|
||||
var windowOf = function (element) {
|
||||
var dom = element.dom();
|
||||
if (dom === dom.window && element instanceof domGlobals.Window) {
|
||||
return element;
|
||||
}
|
||||
return isDocument(element) ? dom.defaultView || dom.parentWindow : null;
|
||||
};
|
||||
|
||||
var r = function (left, top) {
|
||||
var translate = function (x, y) {
|
||||
return r(left + x, top + y);
|
||||
@@ -2799,7 +2767,7 @@ var table = (function (domGlobals) {
|
||||
var absolute = function (element) {
|
||||
var doc = element.dom().ownerDocument;
|
||||
var body = doc.body;
|
||||
var win = windowOf(Element.fromDom(doc));
|
||||
var win = doc.defaultView;
|
||||
var html = doc.documentElement;
|
||||
var scrollTop = firstDefinedOrZero(win.pageYOffset, html.scrollTop);
|
||||
var scrollLeft = firstDefinedOrZero(win.pageXOffset, html.scrollLeft);
|
||||
@@ -2811,11 +2779,10 @@ var table = (function (domGlobals) {
|
||||
var dom = element.dom();
|
||||
var doc = dom.ownerDocument;
|
||||
var body = doc.body;
|
||||
var html = Element.fromDom(doc.documentElement);
|
||||
if (body === dom) {
|
||||
return Position(body.offsetLeft, body.offsetTop);
|
||||
}
|
||||
if (!attached(element, html)) {
|
||||
if (!inBody(element)) {
|
||||
return Position(0, 0);
|
||||
}
|
||||
return boxPosition(dom);
|
||||
@@ -3531,7 +3498,7 @@ var table = (function (domGlobals) {
|
||||
var onPaste = function (warehouse, target) {
|
||||
return TableLookup.cell(target.element()).bind(function (cell) {
|
||||
return findInWarehouse(warehouse, cell).map(function (details) {
|
||||
var value = __assign({}, details, {
|
||||
var value = __assign(__assign({}, details), {
|
||||
generators: target.generators,
|
||||
clipboard: target.clipboard
|
||||
});
|
||||
@@ -4328,8 +4295,9 @@ var table = (function (domGlobals) {
|
||||
});
|
||||
};
|
||||
var baseWith = function (handleUnsupported, required, pred) {
|
||||
if (required.length === 0)
|
||||
if (required.length === 0) {
|
||||
throw new Error('You must specify at least one required field.');
|
||||
}
|
||||
validateStrArr('required', required);
|
||||
checkDupes(required);
|
||||
return function (obj) {
|
||||
@@ -4337,14 +4305,16 @@ var table = (function (domGlobals) {
|
||||
var allReqd = forall(required, function (req) {
|
||||
return contains(keys$1, req);
|
||||
});
|
||||
if (!allReqd)
|
||||
if (!allReqd) {
|
||||
reqMessage(required, keys$1);
|
||||
}
|
||||
handleUnsupported(required, keys$1);
|
||||
var invalidKeys = filter(required, function (key) {
|
||||
return !pred.validate(obj[key], key);
|
||||
});
|
||||
if (invalidKeys.length > 0)
|
||||
if (invalidKeys.length > 0) {
|
||||
invalidTypeMessage(invalidKeys, pred.label);
|
||||
}
|
||||
return obj;
|
||||
};
|
||||
};
|
||||
@@ -4352,8 +4322,9 @@ var table = (function (domGlobals) {
|
||||
var unsupported = filter(keys, function (key) {
|
||||
return !contains(required, key);
|
||||
});
|
||||
if (unsupported.length > 0)
|
||||
if (unsupported.length > 0) {
|
||||
unsuppMessage(unsupported);
|
||||
}
|
||||
};
|
||||
var exactly = function (required) {
|
||||
return base(handleExact, required);
|
||||
@@ -6329,7 +6300,9 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
};
|
||||
var detached = function (editable, chrome) {
|
||||
var origin = curry(absolute, chrome);
|
||||
var origin = function () {
|
||||
return absolute(chrome);
|
||||
};
|
||||
return {
|
||||
parent: constant(chrome),
|
||||
view: constant(editable),
|
||||
@@ -6449,17 +6422,20 @@ var table = (function (domGlobals) {
|
||||
var baseMerge = function (merger) {
|
||||
return function () {
|
||||
var objects = new Array(arguments.length);
|
||||
for (var i = 0; i < objects.length; i++)
|
||||
for (var i = 0; i < objects.length; i++) {
|
||||
objects[i] = arguments[i];
|
||||
if (objects.length === 0)
|
||||
}
|
||||
if (objects.length === 0) {
|
||||
throw new Error('Can\'t merge zero objects');
|
||||
}
|
||||
var ret = {};
|
||||
for (var j = 0; j < objects.length; j++) {
|
||||
var curObject = objects[j];
|
||||
for (var key in curObject)
|
||||
for (var key in curObject) {
|
||||
if (hasOwnProperty.call(curObject, key)) {
|
||||
ret[key] = merger(ret[key], curObject[key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
@@ -6568,8 +6544,9 @@ var table = (function (domGlobals) {
|
||||
for (var _i = 0; _i < arguments.length; _i++) {
|
||||
args[_i] = arguments[_i];
|
||||
}
|
||||
if (timer !== null)
|
||||
if (timer !== null) {
|
||||
domGlobals.clearTimeout(timer);
|
||||
}
|
||||
timer = domGlobals.setTimeout(function () {
|
||||
fn.apply(null, args);
|
||||
timer = null;
|
||||
@@ -6876,7 +6853,7 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
};
|
||||
|
||||
function TableResize (wire, vdirection) {
|
||||
var create$2 = function (wire, vdirection) {
|
||||
var hdirection = BarPositions.height;
|
||||
var manager = BarManager(wire, vdirection, hdirection);
|
||||
var events = Events.create({
|
||||
@@ -6907,7 +6884,8 @@ var table = (function (domGlobals) {
|
||||
destroy: manager.destroy,
|
||||
events: events.registry
|
||||
};
|
||||
}
|
||||
};
|
||||
var TableResize = { create: create$2 };
|
||||
|
||||
var createContainer = function () {
|
||||
var container = Element.fromTag('div');
|
||||
@@ -6966,7 +6944,7 @@ var table = (function (domGlobals) {
|
||||
var rawWire = TableWire.get(editor);
|
||||
wire = Option.some(rawWire);
|
||||
if (hasObjectResizing(editor) && hasTableResizeBars(editor)) {
|
||||
var sz = TableResize(rawWire, direction);
|
||||
var sz = TableResize.create(rawWire, direction);
|
||||
sz.on();
|
||||
sz.events.startDrag.bind(function (event) {
|
||||
selectionRng = Option.some(editor.selection.getRng());
|
||||
@@ -7046,7 +7024,7 @@ var table = (function (domGlobals) {
|
||||
}
|
||||
return adt$1.none(current);
|
||||
};
|
||||
var CellLocation = __assign({}, adt$1, { none: none$1 });
|
||||
var CellLocation = __assign(__assign({}, adt$1), { none: none$1 });
|
||||
|
||||
var detect$4 = function (current, isRoot) {
|
||||
return TableLookup.table(current, isRoot).bind(function (table) {
|
||||
@@ -7083,8 +7061,8 @@ var table = (function (domGlobals) {
|
||||
prev: prev
|
||||
};
|
||||
|
||||
var create$2 = Immutable('start', 'soffset', 'finish', 'foffset');
|
||||
var SimRange = { create: create$2 };
|
||||
var create$3 = Immutable('start', 'soffset', 'finish', 'foffset');
|
||||
var SimRange = { create: create$3 };
|
||||
|
||||
var adt$2 = Adt.generate([
|
||||
{ before: ['element'] },
|
||||
@@ -7365,8 +7343,7 @@ var table = (function (domGlobals) {
|
||||
});
|
||||
};
|
||||
var locateNode = function (doc, node, x, y) {
|
||||
var locator = isText(node) ? locate : searchInChildren;
|
||||
return locator(doc, node, x, y);
|
||||
return isText(node) ? locate(doc, node, x, y) : searchInChildren(doc, node, x, y);
|
||||
};
|
||||
var locate$1 = function (doc, node, x, y) {
|
||||
var r = doc.dom().createRange();
|
||||
@@ -7651,16 +7628,16 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
var TabContext = { handle: handle$1 };
|
||||
|
||||
var create$3 = Immutable('selection', 'kill');
|
||||
var Response = { create: create$3 };
|
||||
var create$4 = Immutable('selection', 'kill');
|
||||
var Response = { create: create$4 };
|
||||
|
||||
var create$4 = function (start, soffset, finish, foffset) {
|
||||
var create$5 = function (start, soffset, finish, foffset) {
|
||||
return {
|
||||
start: constant(Situ.on(start, soffset)),
|
||||
finish: constant(Situ.on(finish, foffset))
|
||||
};
|
||||
};
|
||||
var Situs = { create: create$4 };
|
||||
var Situs = { create: create$5 };
|
||||
|
||||
var convertToRange = function (win, selection) {
|
||||
var rng = asLtrRange(win, selection);
|
||||
@@ -7804,10 +7781,11 @@ var table = (function (domGlobals) {
|
||||
var hone = function (universe, item, predicate, mode, direction, isRoot) {
|
||||
var next = go$1(universe, item, mode, direction);
|
||||
return next.bind(function (n) {
|
||||
if (isRoot(n.item()))
|
||||
if (isRoot(n.item())) {
|
||||
return Option.none();
|
||||
else
|
||||
} else {
|
||||
return predicate(n.item()) ? Option.some(n.item()) : hone(universe, n.item(), predicate, n.mode(), direction, isRoot);
|
||||
}
|
||||
});
|
||||
};
|
||||
var left$1 = function (universe, item, predicate, isRoot) {
|
||||
@@ -7890,7 +7868,7 @@ var table = (function (domGlobals) {
|
||||
var cata$2 = function (subject, onNone, onSuccess, onFailedUp, onFailedDown) {
|
||||
return subject.fold(onNone, onSuccess, onFailedUp, onFailedDown);
|
||||
};
|
||||
var BeforeAfter = __assign({}, adt$5, {
|
||||
var BeforeAfter = __assign(__assign({}, adt$5), {
|
||||
verify: verify,
|
||||
cata: cata$2
|
||||
});
|
||||
@@ -8415,6 +8393,18 @@ var table = (function (domGlobals) {
|
||||
isNavigation: isNavigation
|
||||
};
|
||||
|
||||
var toRaw = function (sr) {
|
||||
return {
|
||||
left: sr.left(),
|
||||
top: sr.top(),
|
||||
right: sr.right(),
|
||||
bottom: sr.bottom(),
|
||||
width: sr.width(),
|
||||
height: sr.height()
|
||||
};
|
||||
};
|
||||
var Rect = { toRaw: toRaw };
|
||||
|
||||
var isSafari = PlatformDetection$1.detect().browser.isSafari();
|
||||
var get$a = function (_DOC) {
|
||||
var doc = _DOC !== undefined ? _DOC.dom() : domGlobals.document;
|
||||
@@ -8437,9 +8427,7 @@ var table = (function (domGlobals) {
|
||||
};
|
||||
var getRangedRect = function (start, soffset, finish, foffset) {
|
||||
var sel = Selection.exact(start, soffset, finish, foffset);
|
||||
return getFirstRect$1(win, sel).map(function (structRect) {
|
||||
return map$1(structRect, apply);
|
||||
});
|
||||
return getFirstRect$1(win, sel).map(Rect.toRaw);
|
||||
};
|
||||
var getSelection = function () {
|
||||
return get$9(win).map(function (exactAdt) {
|
||||
@@ -8769,6 +8757,9 @@ var table = (function (domGlobals) {
|
||||
if (raw.buttons === undefined) {
|
||||
return true;
|
||||
}
|
||||
if (global$2.ie && global$2.ie >= 12 && raw.buttons === 0) {
|
||||
return true;
|
||||
}
|
||||
return (raw.buttons & 1) !== 0;
|
||||
};
|
||||
var mouseDown = function (e) {
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -22,6 +22,17 @@ var textpattern = (function (domGlobals) {
|
||||
|
||||
var global = tinymce.util.Tools.resolve('tinymce.PluginManager');
|
||||
|
||||
function __spreadArrays() {
|
||||
for (var s = 0, i = 0, il = arguments.length; i < il; i++)
|
||||
s += arguments[i].length;
|
||||
for (var r = Array(s), k = 0, i = 0; i < il; i++)
|
||||
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
|
||||
r[k] = a[j];
|
||||
return r;
|
||||
}
|
||||
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -30,8 +41,6 @@ var textpattern = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -45,37 +54,27 @@ var textpattern = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -84,20 +83,16 @@ var textpattern = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -108,8 +103,8 @@ var textpattern = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -117,35 +112,31 @@ var textpattern = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -160,13 +151,16 @@ var textpattern = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -176,24 +170,24 @@ var textpattern = (function (domGlobals) {
|
||||
};
|
||||
var isFunction = isType('function');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var filter = function (xs, pred) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var sort = function (xs, comparator) {
|
||||
var copy = slice.call(xs, 0);
|
||||
var copy = nativeSlice.call(xs, 0);
|
||||
copy.sort(comparator);
|
||||
return copy;
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var hasOwnProperty = Object.hasOwnProperty;
|
||||
@@ -234,7 +228,7 @@ var textpattern = (function (domGlobals) {
|
||||
patternsState.set(createPatternSet(newPatterns));
|
||||
};
|
||||
var getPatterns = function () {
|
||||
return patternsState.get().inlinePatterns.concat(patternsState.get().blockPatterns, patternsState.get().replacementPatterns);
|
||||
return __spreadArrays(patternsState.get().inlinePatterns, patternsState.get().blockPatterns, patternsState.get().replacementPatterns);
|
||||
};
|
||||
return {
|
||||
setPatterns: setPatterns,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -35,36 +35,8 @@ var visualchars = (function (domGlobals) {
|
||||
};
|
||||
var Events = { fireVisualChars: fireVisualChars };
|
||||
|
||||
var charMap = {
|
||||
'\xA0': 'nbsp',
|
||||
'\xAD': 'shy'
|
||||
var noop = function () {
|
||||
};
|
||||
var charMapToRegExp = function (charMap, global) {
|
||||
var key, regExp = '';
|
||||
for (key in charMap) {
|
||||
regExp += key;
|
||||
}
|
||||
return new RegExp('[' + regExp + ']', global ? 'g' : '');
|
||||
};
|
||||
var charMapToSelector = function (charMap) {
|
||||
var key, selector = '';
|
||||
for (key in charMap) {
|
||||
if (selector) {
|
||||
selector += ',';
|
||||
}
|
||||
selector += 'span.mce-' + charMap[key];
|
||||
}
|
||||
return selector;
|
||||
};
|
||||
var Data = {
|
||||
charMap: charMap,
|
||||
regExp: charMapToRegExp(charMap),
|
||||
regExpGlobal: charMapToRegExp(charMap, true),
|
||||
selector: charMapToSelector(charMap),
|
||||
charMapToRegExp: charMapToRegExp,
|
||||
charMapToSelector: charMapToSelector
|
||||
};
|
||||
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -73,8 +45,6 @@ var visualchars = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -88,37 +58,27 @@ var visualchars = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -127,20 +87,16 @@ var visualchars = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -151,8 +107,8 @@ var visualchars = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -160,35 +116,31 @@ var visualchars = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -203,13 +155,16 @@ var visualchars = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -219,24 +174,24 @@ var visualchars = (function (domGlobals) {
|
||||
};
|
||||
var isFunction = isType('function');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var each = function (xs, f) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var fromHtml = function (html, scope) {
|
||||
@@ -290,6 +245,8 @@ var visualchars = (function (domGlobals) {
|
||||
var ENTITY = domGlobals.Node.ENTITY_NODE;
|
||||
var NOTATION = domGlobals.Node.NOTATION_NODE;
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var type = function (element) {
|
||||
return element.dom().nodeType;
|
||||
};
|
||||
@@ -303,13 +260,44 @@ var visualchars = (function (domGlobals) {
|
||||
};
|
||||
var isText = isType$1(TEXT);
|
||||
|
||||
var charMap = {
|
||||
'\xA0': 'nbsp',
|
||||
'\xAD': 'shy'
|
||||
};
|
||||
var charMapToRegExp = function (charMap, global) {
|
||||
var key, regExp = '';
|
||||
for (key in charMap) {
|
||||
regExp += key;
|
||||
}
|
||||
return new RegExp('[' + regExp + ']', global ? 'g' : '');
|
||||
};
|
||||
var charMapToSelector = function (charMap) {
|
||||
var key, selector = '';
|
||||
for (key in charMap) {
|
||||
if (selector) {
|
||||
selector += ',';
|
||||
}
|
||||
selector += 'span.mce-' + charMap[key];
|
||||
}
|
||||
return selector;
|
||||
};
|
||||
var Data = {
|
||||
charMap: charMap,
|
||||
regExp: charMapToRegExp(charMap),
|
||||
regExpGlobal: charMapToRegExp(charMap, true),
|
||||
selector: charMapToSelector(charMap),
|
||||
charMapToRegExp: charMapToRegExp,
|
||||
charMapToSelector: charMapToSelector
|
||||
};
|
||||
|
||||
var wrapCharWithSpan = function (value) {
|
||||
return '<span data-mce-bogus="1" class="mce-' + Data.charMap[value] + '">' + value + '</span>';
|
||||
};
|
||||
var Html = { wrapCharWithSpan: wrapCharWithSpan };
|
||||
|
||||
var isMatch = function (n) {
|
||||
return isText(n) && value(n) !== undefined && Data.regExp.test(value(n));
|
||||
var value$1 = value(n);
|
||||
return isText(n) && value$1 !== undefined && Data.regExp.test(value$1);
|
||||
};
|
||||
var filterDescendants = function (scope, predicate) {
|
||||
var result = [];
|
||||
@@ -331,8 +319,8 @@ var visualchars = (function (domGlobals) {
|
||||
elm = elm.parentNode;
|
||||
}
|
||||
};
|
||||
var replaceWithSpans = function (html) {
|
||||
return html.replace(Data.regExpGlobal, Html.wrapCharWithSpan);
|
||||
var replaceWithSpans = function (text) {
|
||||
return text.replace(Data.regExpGlobal, Html.wrapCharWithSpan);
|
||||
};
|
||||
var Nodes = {
|
||||
isMatch: isMatch,
|
||||
@@ -345,7 +333,7 @@ var visualchars = (function (domGlobals) {
|
||||
var node, div;
|
||||
var nodeList = Nodes.filterDescendants(Element.fromDom(rootElm), Nodes.isMatch);
|
||||
each(nodeList, function (n) {
|
||||
var withSpans = Nodes.replaceWithSpans(value(n));
|
||||
var withSpans = Nodes.replaceWithSpans(editor.dom.encode(value(n)));
|
||||
div = editor.dom.create('div', null, withSpans);
|
||||
while (node = div.lastChild) {
|
||||
editor.dom.insertAfter(node, n.dom());
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -65,6 +65,8 @@ var wordcount = (function () {
|
||||
WHITESPACE: WHITESPACE
|
||||
};
|
||||
|
||||
var noop = function () {
|
||||
};
|
||||
var constant = function (value) {
|
||||
return function () {
|
||||
return value;
|
||||
@@ -73,8 +75,6 @@ var wordcount = (function () {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -88,37 +88,27 @@ var wordcount = (function () {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -127,19 +117,23 @@ var wordcount = (function () {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -149,18 +143,18 @@ var wordcount = (function () {
|
||||
};
|
||||
var isFunction = isType('function');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var from = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var SETS$1 = UnicodeData.SETS;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -560,8 +560,6 @@ var inlite = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -575,37 +573,27 @@ var inlite = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -614,20 +602,16 @@ var inlite = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -638,8 +622,8 @@ var inlite = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -647,35 +631,31 @@ var inlite = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -690,13 +670,16 @@ var inlite = (function (domGlobals) {
|
||||
};
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType$1 = function (type) {
|
||||
@@ -704,47 +687,49 @@ var inlite = (function (domGlobals) {
|
||||
return typeOf(value) === type;
|
||||
};
|
||||
};
|
||||
var isArray$1 = isType$1('array');
|
||||
var isFunction$1 = isType$1('function');
|
||||
var isNumber$1 = isType$1('number');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var rawIndexOf = function () {
|
||||
var pIndexOf = Array.prototype.indexOf;
|
||||
var fastIndex = function (xs, x) {
|
||||
return pIndexOf.call(xs, x);
|
||||
};
|
||||
var slowIndex = function (xs, x) {
|
||||
return slowIndexOf(xs, x);
|
||||
};
|
||||
return pIndexOf === undefined ? slowIndex : fastIndex;
|
||||
}();
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var nativeIndexOf = Array.prototype.indexOf;
|
||||
var nativePush = Array.prototype.push;
|
||||
var rawIndexOf = function (ts, t) {
|
||||
return nativeIndexOf.call(ts, t);
|
||||
};
|
||||
var indexOf = function (xs, x) {
|
||||
var r = rawIndexOf(xs, x);
|
||||
return r === -1 ? Option.none() : Option.some(r);
|
||||
};
|
||||
var exists = function (xs, pred) {
|
||||
return findIndex(xs, pred).isSome();
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var each = function (xs, f) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var filter = function (xs, pred) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
@@ -759,41 +744,24 @@ var inlite = (function (domGlobals) {
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var findIndex = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
return Option.some(i);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var slowIndexOf = function (xs, x) {
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (xs[i] === x) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
var push = Array.prototype.push;
|
||||
var flatten$1 = function (xs) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (!Array.prototype.isPrototypeOf(xs[i]))
|
||||
if (!isArray$1(xs[i])) {
|
||||
throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
|
||||
push.apply(r, xs[i]);
|
||||
}
|
||||
nativePush.apply(r, xs[i]);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var from$1 = isFunction$1(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var count = 0;
|
||||
@@ -1225,7 +1193,7 @@ var inlite = (function (domGlobals) {
|
||||
});
|
||||
|
||||
var Collection$1, proto;
|
||||
var push$1 = Array.prototype.push, slice$1 = Array.prototype.slice;
|
||||
var push = Array.prototype.push, slice = Array.prototype.slice;
|
||||
proto = {
|
||||
length: 0,
|
||||
init: function (items) {
|
||||
@@ -1239,10 +1207,10 @@ var inlite = (function (domGlobals) {
|
||||
if (items instanceof Collection$1) {
|
||||
self.add(items.toArray());
|
||||
} else {
|
||||
push$1.call(self, items);
|
||||
push.call(self, items);
|
||||
}
|
||||
} else {
|
||||
push$1.apply(self, items);
|
||||
push.apply(self, items);
|
||||
}
|
||||
return self;
|
||||
},
|
||||
@@ -1279,7 +1247,7 @@ var inlite = (function (domGlobals) {
|
||||
return new Collection$1(matches);
|
||||
},
|
||||
slice: function () {
|
||||
return new Collection$1(slice$1.apply(this, arguments));
|
||||
return new Collection$1(slice.apply(this, arguments));
|
||||
},
|
||||
eq: function (index) {
|
||||
return index === -1 ? this.slice(index) : this.slice(index, +index + 1);
|
||||
@@ -4234,8 +4202,9 @@ var inlite = (function (domGlobals) {
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
@@ -4248,8 +4217,9 @@ var inlite = (function (domGlobals) {
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
@@ -5172,6 +5142,7 @@ var inlite = (function (domGlobals) {
|
||||
global$7(self.getEl('button')).on('click touchstart', function (e) {
|
||||
e.stopPropagation();
|
||||
input.click();
|
||||
e.preventDefault();
|
||||
});
|
||||
self.getEl().appendChild(input);
|
||||
},
|
||||
@@ -6311,18 +6282,20 @@ var inlite = (function (domGlobals) {
|
||||
var firstMatch = function (regexes, s) {
|
||||
for (var i = 0; i < regexes.length; i++) {
|
||||
var x = regexes[i];
|
||||
if (x.test(s))
|
||||
if (x.test(s)) {
|
||||
return x;
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
var find$1 = function (regexes, agent) {
|
||||
var r = firstMatch(regexes, agent);
|
||||
if (!r)
|
||||
if (!r) {
|
||||
return {
|
||||
major: 0,
|
||||
minor: 0
|
||||
};
|
||||
}
|
||||
var group = function (i) {
|
||||
return Number(agent.replace(r, '$' + i));
|
||||
};
|
||||
@@ -6330,8 +6303,9 @@ var inlite = (function (domGlobals) {
|
||||
};
|
||||
var detect = function (versionRegexes, agent) {
|
||||
var cleanedAgent = String(agent).toLowerCase();
|
||||
if (versionRegexes.length === 0)
|
||||
if (versionRegexes.length === 0) {
|
||||
return unknown();
|
||||
}
|
||||
return find$1(versionRegexes, cleanedAgent);
|
||||
};
|
||||
var unknown = function () {
|
||||
@@ -6501,8 +6475,7 @@ var inlite = (function (domGlobals) {
|
||||
name: 'Edge',
|
||||
versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
|
||||
search: function (uastring) {
|
||||
var monstrosity = contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
return monstrosity;
|
||||
return contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -7826,11 +7799,11 @@ var inlite = (function (domGlobals) {
|
||||
return menuItem && menuItem.text === '-';
|
||||
};
|
||||
var trimMenuItems = function (menuItems) {
|
||||
var menuItems2 = filter(menuItems, function (menuItem, i, menuItems) {
|
||||
var menuItems2 = filter(menuItems, function (menuItem, i) {
|
||||
return !isSeparator(menuItem) || !isSeparator(menuItems[i - 1]);
|
||||
});
|
||||
return filter(menuItems2, function (menuItem, i, menuItems) {
|
||||
return !isSeparator(menuItem) || i > 0 && i < menuItems.length - 1;
|
||||
return filter(menuItems2, function (menuItem, i) {
|
||||
return !isSeparator(menuItem) || i > 0 && i < menuItems2.length - 1;
|
||||
});
|
||||
};
|
||||
var createContextMenuItems = function (editor, context) {
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
+1
-1
File diff suppressed because one or more lines are too long
@@ -159,8 +159,6 @@ var modern = (function (domGlobals) {
|
||||
var never = constant(false);
|
||||
var always = constant(true);
|
||||
|
||||
var never$1 = never;
|
||||
var always$1 = always;
|
||||
var none = function () {
|
||||
return NONE;
|
||||
};
|
||||
@@ -174,37 +172,27 @@ var modern = (function (domGlobals) {
|
||||
var id = function (n) {
|
||||
return n;
|
||||
};
|
||||
var noop = function () {
|
||||
};
|
||||
var nul = function () {
|
||||
return null;
|
||||
};
|
||||
var undef = function () {
|
||||
return undefined;
|
||||
};
|
||||
var me = {
|
||||
fold: function (n, s) {
|
||||
return n();
|
||||
},
|
||||
is: never$1,
|
||||
isSome: never$1,
|
||||
isNone: always$1,
|
||||
is: never,
|
||||
isSome: never,
|
||||
isNone: always,
|
||||
getOr: id,
|
||||
getOrThunk: call,
|
||||
getOrDie: function (msg) {
|
||||
throw new Error(msg || 'error: getOrDie called on none.');
|
||||
},
|
||||
getOrNull: nul,
|
||||
getOrUndefined: undef,
|
||||
getOrNull: constant(null),
|
||||
getOrUndefined: constant(undefined),
|
||||
or: id,
|
||||
orThunk: call,
|
||||
map: none,
|
||||
ap: none,
|
||||
each: noop,
|
||||
bind: none,
|
||||
flatten: none,
|
||||
exists: never$1,
|
||||
forall: always$1,
|
||||
exists: never,
|
||||
forall: always,
|
||||
filter: none,
|
||||
equals: eq,
|
||||
equals_: eq,
|
||||
@@ -213,20 +201,16 @@ var modern = (function (domGlobals) {
|
||||
},
|
||||
toString: constant('none()')
|
||||
};
|
||||
if (Object.freeze)
|
||||
if (Object.freeze) {
|
||||
Object.freeze(me);
|
||||
}
|
||||
return me;
|
||||
}();
|
||||
var some = function (a) {
|
||||
var constant_a = function () {
|
||||
return a;
|
||||
};
|
||||
var constant_a = constant(a);
|
||||
var self = function () {
|
||||
return me;
|
||||
};
|
||||
var map = function (f) {
|
||||
return some(f(a));
|
||||
};
|
||||
var bind = function (f) {
|
||||
return f(a);
|
||||
};
|
||||
@@ -237,8 +221,8 @@ var modern = (function (domGlobals) {
|
||||
is: function (v) {
|
||||
return a === v;
|
||||
},
|
||||
isSome: always$1,
|
||||
isNone: never$1,
|
||||
isSome: always,
|
||||
isNone: never,
|
||||
getOr: constant_a,
|
||||
getOrThunk: constant_a,
|
||||
getOrDie: constant_a,
|
||||
@@ -246,35 +230,31 @@ var modern = (function (domGlobals) {
|
||||
getOrUndefined: constant_a,
|
||||
or: self,
|
||||
orThunk: self,
|
||||
map: map,
|
||||
ap: function (optfab) {
|
||||
return optfab.fold(none, function (fab) {
|
||||
return some(fab(a));
|
||||
});
|
||||
map: function (f) {
|
||||
return some(f(a));
|
||||
},
|
||||
each: function (f) {
|
||||
f(a);
|
||||
},
|
||||
bind: bind,
|
||||
flatten: constant_a,
|
||||
exists: bind,
|
||||
forall: bind,
|
||||
filter: function (f) {
|
||||
return f(a) ? me : NONE;
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never$1, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
},
|
||||
toArray: function () {
|
||||
return [a];
|
||||
},
|
||||
toString: function () {
|
||||
return 'some(' + a + ')';
|
||||
},
|
||||
equals: function (o) {
|
||||
return o.is(a);
|
||||
},
|
||||
equals_: function (o, elementEq) {
|
||||
return o.fold(never, function (b) {
|
||||
return elementEq(a, b);
|
||||
});
|
||||
}
|
||||
};
|
||||
return me;
|
||||
@@ -663,13 +643,16 @@ var modern = (function (domGlobals) {
|
||||
var ContextToolbars = { addContextualToolbars: addContextualToolbars };
|
||||
|
||||
var typeOf = function (x) {
|
||||
if (x === null)
|
||||
if (x === null) {
|
||||
return 'null';
|
||||
}
|
||||
var t = typeof x;
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array'))
|
||||
if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
|
||||
return 'array';
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String'))
|
||||
}
|
||||
if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
|
||||
return 'string';
|
||||
}
|
||||
return t;
|
||||
};
|
||||
var isType = function (type) {
|
||||
@@ -677,47 +660,49 @@ var modern = (function (domGlobals) {
|
||||
return typeOf(value) === type;
|
||||
};
|
||||
};
|
||||
var isArray = isType('array');
|
||||
var isFunction = isType('function');
|
||||
var isNumber = isType('number');
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
var rawIndexOf = function () {
|
||||
var pIndexOf = Array.prototype.indexOf;
|
||||
var fastIndex = function (xs, x) {
|
||||
return pIndexOf.call(xs, x);
|
||||
};
|
||||
var slowIndex = function (xs, x) {
|
||||
return slowIndexOf(xs, x);
|
||||
};
|
||||
return pIndexOf === undefined ? slowIndex : fastIndex;
|
||||
}();
|
||||
var nativeSlice = Array.prototype.slice;
|
||||
var nativeIndexOf = Array.prototype.indexOf;
|
||||
var nativePush = Array.prototype.push;
|
||||
var rawIndexOf = function (ts, t) {
|
||||
return nativeIndexOf.call(ts, t);
|
||||
};
|
||||
var indexOf = function (xs, x) {
|
||||
var r = rawIndexOf(xs, x);
|
||||
return r === -1 ? Option.none() : Option.some(r);
|
||||
};
|
||||
var exists = function (xs, pred) {
|
||||
return findIndex(xs, pred).isSome();
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
var map = function (xs, f) {
|
||||
var len = xs.length;
|
||||
var r = new Array(len);
|
||||
for (var i = 0; i < len; i++) {
|
||||
var x = xs[i];
|
||||
r[i] = f(x, i, xs);
|
||||
r[i] = f(x, i);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var each = function (xs, f) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
f(x, i, xs);
|
||||
f(x, i);
|
||||
}
|
||||
};
|
||||
var filter = function (xs, pred) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
r.push(x);
|
||||
}
|
||||
}
|
||||
@@ -732,7 +717,7 @@ var modern = (function (domGlobals) {
|
||||
var find = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(x);
|
||||
}
|
||||
}
|
||||
@@ -741,32 +726,24 @@ var modern = (function (domGlobals) {
|
||||
var findIndex = function (xs, pred) {
|
||||
for (var i = 0, len = xs.length; i < len; i++) {
|
||||
var x = xs[i];
|
||||
if (pred(x, i, xs)) {
|
||||
if (pred(x, i)) {
|
||||
return Option.some(i);
|
||||
}
|
||||
}
|
||||
return Option.none();
|
||||
};
|
||||
var slowIndexOf = function (xs, x) {
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (xs[i] === x) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
var push = Array.prototype.push;
|
||||
var flatten = function (xs) {
|
||||
var r = [];
|
||||
for (var i = 0, len = xs.length; i < len; ++i) {
|
||||
if (!Array.prototype.isPrototypeOf(xs[i]))
|
||||
if (!isArray(xs[i])) {
|
||||
throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
|
||||
push.apply(r, xs[i]);
|
||||
}
|
||||
nativePush.apply(r, xs[i]);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
|
||||
return slice.call(x);
|
||||
return nativeSlice.call(x);
|
||||
};
|
||||
|
||||
var defaultMenus = {
|
||||
@@ -822,11 +799,11 @@ var modern = (function (domGlobals) {
|
||||
var menuItemsPass1 = filter(namedMenuItems, function (namedMenuItem) {
|
||||
return removedMenuItems.hasOwnProperty(namedMenuItem.name) === false;
|
||||
});
|
||||
var menuItemsPass2 = filter(menuItemsPass1, function (namedMenuItem, i, namedMenuItems) {
|
||||
return !isSeparator(namedMenuItem) || !isSeparator(namedMenuItems[i - 1]);
|
||||
var menuItemsPass2 = filter(menuItemsPass1, function (namedMenuItem, i) {
|
||||
return !isSeparator(namedMenuItem) || !isSeparator(menuItemsPass1[i - 1]);
|
||||
});
|
||||
return filter(menuItemsPass2, function (namedMenuItem, i, namedMenuItems) {
|
||||
return !isSeparator(namedMenuItem) || i > 0 && i < namedMenuItems.length - 1;
|
||||
return filter(menuItemsPass2, function (namedMenuItem, i) {
|
||||
return !isSeparator(namedMenuItem) || i > 0 && i < menuItemsPass2.length - 1;
|
||||
});
|
||||
};
|
||||
var createMenu = function (editorMenuItems, menus, removedMenuItems, context) {
|
||||
@@ -1765,7 +1742,7 @@ var modern = (function (domGlobals) {
|
||||
});
|
||||
|
||||
var Collection$1, proto;
|
||||
var push$1 = Array.prototype.push, slice$1 = Array.prototype.slice;
|
||||
var push = Array.prototype.push, slice = Array.prototype.slice;
|
||||
proto = {
|
||||
length: 0,
|
||||
init: function (items) {
|
||||
@@ -1779,10 +1756,10 @@ var modern = (function (domGlobals) {
|
||||
if (items instanceof Collection$1) {
|
||||
self.add(items.toArray());
|
||||
} else {
|
||||
push$1.call(self, items);
|
||||
push.call(self, items);
|
||||
}
|
||||
} else {
|
||||
push$1.apply(self, items);
|
||||
push.apply(self, items);
|
||||
}
|
||||
return self;
|
||||
},
|
||||
@@ -1819,7 +1796,7 @@ var modern = (function (domGlobals) {
|
||||
return new Collection$1(matches);
|
||||
},
|
||||
slice: function () {
|
||||
return new Collection$1(slice$1.apply(this, arguments));
|
||||
return new Collection$1(slice.apply(this, arguments));
|
||||
},
|
||||
eq: function (index) {
|
||||
return index === -1 ? this.slice(index) : this.slice(index, +index + 1);
|
||||
@@ -4990,6 +4967,7 @@ var modern = (function (domGlobals) {
|
||||
global$9(self.getEl('button')).on('click touchstart', function (e) {
|
||||
e.stopPropagation();
|
||||
input.click();
|
||||
e.preventDefault();
|
||||
});
|
||||
self.getEl().appendChild(input);
|
||||
},
|
||||
@@ -6087,6 +6065,32 @@ var modern = (function (domGlobals) {
|
||||
var ENTITY = domGlobals.Node.ENTITY_NODE;
|
||||
var NOTATION = domGlobals.Node.NOTATION_NODE;
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
|
||||
o = o[parts[i]];
|
||||
}
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null) {
|
||||
throw new Error(name + ' not available on this browser');
|
||||
}
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
var Immutable = function () {
|
||||
var fields = [];
|
||||
for (var _i = 0; _i < arguments.length; _i++) {
|
||||
@@ -6108,30 +6112,6 @@ var modern = (function (domGlobals) {
|
||||
};
|
||||
};
|
||||
|
||||
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
|
||||
|
||||
var path = function (parts, scope) {
|
||||
var o = scope !== undefined && scope !== null ? scope : Global;
|
||||
for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
|
||||
o = o[parts[i]];
|
||||
return o;
|
||||
};
|
||||
var resolve = function (p, scope) {
|
||||
var parts = p.split('.');
|
||||
return path(parts, scope);
|
||||
};
|
||||
|
||||
var unsafe = function (name, scope) {
|
||||
return resolve(name, scope);
|
||||
};
|
||||
var getOrDie = function (name, scope) {
|
||||
var actual = unsafe(name, scope);
|
||||
if (actual === undefined || actual === null)
|
||||
throw name + ' not available on this browser';
|
||||
return actual;
|
||||
};
|
||||
var Global$1 = { getOrDie: getOrDie };
|
||||
|
||||
var node = function () {
|
||||
var f = Global$1.getOrDie('Node');
|
||||
return f;
|
||||
@@ -6153,18 +6133,20 @@ var modern = (function (domGlobals) {
|
||||
var firstMatch = function (regexes, s) {
|
||||
for (var i = 0; i < regexes.length; i++) {
|
||||
var x = regexes[i];
|
||||
if (x.test(s))
|
||||
if (x.test(s)) {
|
||||
return x;
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
var find$1 = function (regexes, agent) {
|
||||
var r = firstMatch(regexes, agent);
|
||||
if (!r)
|
||||
if (!r) {
|
||||
return {
|
||||
major: 0,
|
||||
minor: 0
|
||||
};
|
||||
}
|
||||
var group = function (i) {
|
||||
return Number(agent.replace(r, '$' + i));
|
||||
};
|
||||
@@ -6172,8 +6154,9 @@ var modern = (function (domGlobals) {
|
||||
};
|
||||
var detect = function (versionRegexes, agent) {
|
||||
var cleanedAgent = String(agent).toLowerCase();
|
||||
if (versionRegexes.length === 0)
|
||||
if (versionRegexes.length === 0) {
|
||||
return unknown();
|
||||
}
|
||||
return find$1(versionRegexes, cleanedAgent);
|
||||
};
|
||||
var unknown = function () {
|
||||
@@ -6343,8 +6326,7 @@ var modern = (function (domGlobals) {
|
||||
name: 'Edge',
|
||||
versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
|
||||
search: function (uastring) {
|
||||
var monstrosity = contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
return monstrosity;
|
||||
return contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit');
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -7668,11 +7650,11 @@ var modern = (function (domGlobals) {
|
||||
return menuItem && menuItem.text === '-';
|
||||
};
|
||||
var trimMenuItems = function (menuItems) {
|
||||
var menuItems2 = filter(menuItems, function (menuItem, i, menuItems) {
|
||||
var menuItems2 = filter(menuItems, function (menuItem, i) {
|
||||
return !isSeparator$1(menuItem) || !isSeparator$1(menuItems[i - 1]);
|
||||
});
|
||||
return filter(menuItems2, function (menuItem, i, menuItems) {
|
||||
return !isSeparator$1(menuItem) || i > 0 && i < menuItems.length - 1;
|
||||
return filter(menuItems2, function (menuItem, i) {
|
||||
return !isSeparator$1(menuItem) || i > 0 && i < menuItems2.length - 1;
|
||||
});
|
||||
};
|
||||
var createContextMenuItems = function (editor, context) {
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
+43
-52
@@ -1,16 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="system.web.webPages.razor"
|
||||
type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="host"
|
||||
type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
|
||||
requirePermission="false" />
|
||||
<section name="pages"
|
||||
type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
|
||||
requirePermission="false" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
|
||||
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
|
||||
<system.web.webPages.razor>
|
||||
<pages pageBaseType="System.Web.Mvc.WebViewPage">
|
||||
<namespaces>
|
||||
@@ -18,53 +14,48 @@
|
||||
<add namespace="System.Web.Optimization" />
|
||||
<add namespace="LeafWeb.Core.Utility" />
|
||||
<add namespace="LeafWeb.WebCms.Models" />
|
||||
<add namespace="System.Web.Mvc" />
|
||||
<add namespace="System.Web.Mvc.Ajax" />
|
||||
<add namespace="System.Web.Mvc.Html" />
|
||||
<add namespace="System.Web.Routing" />
|
||||
<add namespace="Umbraco.Web" />
|
||||
<add namespace="Umbraco.Core" />
|
||||
<add namespace="Umbraco.Core.Models" />
|
||||
<add namespace="Umbraco.Web.Mvc" />
|
||||
<add namespace="umbraco" />
|
||||
<add namespace="Examine" />
|
||||
<add namespace="Umbraco.Web.PublishedContentModels" />
|
||||
</namespaces>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<add namespace="System.Web.Mvc" /><add namespace="System.Web.Mvc.Ajax" /><add namespace="System.Web.Mvc.Html" /><add namespace="System.Web.Routing" /><add namespace="Umbraco.Web" /><add namespace="Umbraco.Core" /><add namespace="Umbraco.Core.Models" /><add namespace="Umbraco.Web.Mvc" /><add namespace="umbraco" /><add namespace="Examine" /><add namespace="Umbraco.Web.PublishedContentModels" /></namespaces>
|
||||
</pages>
|
||||
<host
|
||||
factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</system.web.webPages.razor>
|
||||
<appSettings>
|
||||
<add key="webpages:Enabled" value="false" />
|
||||
</appSettings>
|
||||
<system.web>
|
||||
<httpHandlers>
|
||||
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler" />
|
||||
</httpHandlers>
|
||||
|
||||
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /></system.web.webPages.razor>
|
||||
|
||||
|
||||
|
||||
<appSettings>
|
||||
<add key="webpages:Enabled" value="false" />
|
||||
</appSettings><system.web>
|
||||
<httpHandlers>
|
||||
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler" />
|
||||
</httpHandlers>
|
||||
|
||||
<!--
|
||||
<!--
|
||||
Enabling request validation in view pages would cause validation to occur
|
||||
after the input has already been processed by the controller. By default
|
||||
MVC performs request validation before a controller processes the input.
|
||||
To change this behavior apply the ValidateInputAttribute to a
|
||||
controller or action.
|
||||
-->
|
||||
<pages validateRequest="false"
|
||||
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
|
||||
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
|
||||
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<controls>
|
||||
<add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
|
||||
namespace="System.Web.Mvc" tagPrefix="mvc" />
|
||||
</controls>
|
||||
</pages>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<handlers>
|
||||
<remove name="BlockViewHandler" />
|
||||
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode"
|
||||
type="System.Web.HttpNotFoundHandler" />
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
</configuration>
|
||||
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<controls>
|
||||
<add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
|
||||
</controls>
|
||||
</pages>
|
||||
</system.web><system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
|
||||
<handlers>
|
||||
<remove name="BlockViewHandler" />
|
||||
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
|
||||
</handlers>
|
||||
</system.webServer></configuration>
|
||||
+34
-28
@@ -23,15 +23,15 @@
|
||||
<section name="backload" type="Backload.Configuration.BackloadSection, Backload, Version=2, Culture=neutral, PublicKeyToken=02eaf42ab375d363" requirePermission="false" />
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
<sectionGroup name="imageProcessor">
|
||||
<sectionGroup name="imageProcessor">
|
||||
<section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
|
||||
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
|
||||
<section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
|
||||
</sectionGroup></configSections>
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<umbracoConfiguration>
|
||||
<settings configSource="config\umbracoSettings.config" />
|
||||
<BaseRestExtensions configSource="config\BaseRestExtensions.config" />
|
||||
@@ -49,7 +49,7 @@
|
||||
Umbraco web.config configuration documentation can be found here:
|
||||
http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
|
||||
-->
|
||||
<add key="umbracoConfigurationStatus" value="7.15.3" />
|
||||
<add key="umbracoConfigurationStatus" value="7.15.10" />
|
||||
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
|
||||
<add key="umbracoReservedPaths" value="~/umbraco,~/install/,~/hangfire/,~/hangfire,~/backload/,~/backload" />
|
||||
<add key="umbracoPath" value="~/umbraco" />
|
||||
@@ -133,16 +133,16 @@
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</controls>
|
||||
<namespaces>
|
||||
<add namespace="ClientDependency.Core" />
|
||||
<add namespace="ClientDependency.Core.Mvc" />
|
||||
<add namespace="ClientDependency.Core" />
|
||||
</namespaces>
|
||||
</pages>
|
||||
<httpModules>
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" />
|
||||
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></httpModules>
|
||||
</httpModules>
|
||||
<httpHandlers>
|
||||
<remove verb="*" path="*.asmx" />
|
||||
<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
@@ -259,6 +259,8 @@
|
||||
<add assembly="Umbraco.ModelsBuilder" />
|
||||
<add assembly="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add assembly="System.Diagnostics.Tracing, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
</assemblies>
|
||||
<buildProviders>
|
||||
<add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
|
||||
@@ -305,11 +307,11 @@
|
||||
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
|
||||
<remove name="FormsAuthentication" />
|
||||
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
|
||||
|
||||
<remove name="WebDAVModule" />
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
|
||||
<remove name="ClientDependencyModule" />
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
|
||||
<remove name="WebDAVModule" />
|
||||
</modules>
|
||||
<handlers accessPolicy="Read, Write, Script, Execute">
|
||||
<remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="ScriptHandlerFactory" />
|
||||
@@ -385,8 +387,8 @@
|
||||
</rule>
|
||||
</rules>
|
||||
</rewrite>
|
||||
|
||||
<validation validateIntegratedModeConfiguration="false" /></system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
</system.webServer>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- Old asp.net ajax assembly bindings -->
|
||||
@@ -440,6 +442,22 @@
|
||||
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.6.4.0" newVersion="4.6.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Owin.Host.SystemWeb" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.IO.RecyclableMemoryStream" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.11.17.0" newVersion="1.11.17.0" />
|
||||
@@ -490,7 +508,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.15.0" newVersion="2.0.15.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.12.0" newVersion="2.0.12.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral" />
|
||||
@@ -508,18 +526,6 @@
|
||||
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Owin.Host.SystemWeb" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.IO.RecyclableMemoryStream" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
|
||||
@@ -544,15 +550,15 @@
|
||||
</entityFramework>
|
||||
<!-- Note: Web.Backload.config is now in the "\Backload" folder. For previous installations you can leave it in the root folder. -->
|
||||
<backload configSource="Backload\Web.Backload.config" />
|
||||
|
||||
<system.codedom>
|
||||
<compilers>
|
||||
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
|
||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" />
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<imageProcessor>
|
||||
<imageProcessor>
|
||||
<security configSource="config\imageprocessor\security.config" />
|
||||
<caching configSource="config\imageprocessor\cache.config" />
|
||||
<processing configSource="config\imageprocessor\processing.config" />
|
||||
</imageProcessor></configuration>
|
||||
</imageProcessor>
|
||||
</configuration>
|
||||
+147
-62
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\UmbracoCms.7.15.10\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.7.15.10\build\UmbracoCms.props')" />
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
|
||||
<Import Project="..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
|
||||
<Import Project="..\packages\UmbracoCms.7.15.3\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.7.15.3\build\UmbracoCms.props')" />
|
||||
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
@@ -66,20 +66,20 @@
|
||||
<Reference Include="Backload.Contracts, Version=2.2.7.0, Culture=neutral, PublicKeyToken=079b4834180abdf7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Backload.Core.2.2.7\lib\net45\Backload.Contracts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="businesslogic, Version=1.0.7180.24666, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\businesslogic.dll</HintPath>
|
||||
<Reference Include="businesslogic, Version=1.0.8321.19802, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\businesslogic.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
|
||||
<Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="cms, Version=1.0.7180.24666, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\cms.dll</HintPath>
|
||||
<Reference Include="cms, Version=1.0.8321.19802, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\cms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="controls, Version=1.0.7180.24667, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\controls.dll</HintPath>
|
||||
<Reference Include="controls, Version=1.0.8321.19803, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\controls.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
|
||||
@@ -115,11 +115,11 @@
|
||||
<Reference Include="ImageProcessor.Web, Version=4.12.1.216, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ImageProcessor.Web.4.12.1\lib\net452\ImageProcessor.Web.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="interfaces, Version=1.0.7180.24653, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\interfaces.dll</HintPath>
|
||||
<Reference Include="interfaces, Version=1.0.8321.19793, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\interfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
|
||||
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Log4Net.Async, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll</HintPath>
|
||||
@@ -132,7 +132,7 @@
|
||||
<HintPath>..\packages\Markdown.1.14.7\lib\net45\MarkdownSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\Microsoft.ApplicationBlocks.Data.dll</HintPath>
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\Microsoft.ApplicationBlocks.Data.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.3\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
|
||||
@@ -212,38 +212,108 @@
|
||||
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="SQLCE4Umbraco, Version=1.0.7180.24667, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\SQLCE4Umbraco.dll</HintPath>
|
||||
<Reference Include="SQLCE4Umbraco, Version=1.0.8321.19803, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\SQLCE4Umbraco.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.AppContext, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.AppContext.4.1.0\lib\net463\System.AppContext.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.1.6.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\System.Data.SqlServerCe.dll</HintPath>
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\System.Data.SqlServerCe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\System.Data.SqlServerCe.Entity.dll</HintPath>
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\System.Data.SqlServerCe.Entity.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.StackTrace, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Compression" />
|
||||
<Reference Include="System.IO.Compression.FileSystem" />
|
||||
<Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection.Metadata, Version=1.4.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Reflection.Metadata.1.7.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Dataflow.4.10.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Thread, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -290,35 +360,50 @@
|
||||
<Reference Include="System.Web.Services" />
|
||||
<Reference Include="System.EnterpriseServices" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Xml.XmlDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XPath, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XPath.XDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\TidyNet.dll</HintPath>
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\TidyNet.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="umbraco, Version=1.0.7180.24668, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\umbraco.dll</HintPath>
|
||||
<Reference Include="umbraco, Version=1.0.8321.19804, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\umbraco.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Umbraco.Core, Version=1.0.7180.24662, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\Umbraco.Core.dll</HintPath>
|
||||
<Reference Include="Umbraco.Core, Version=1.0.8321.19798, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\Umbraco.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="umbraco.DataLayer, Version=1.0.7180.24666, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\umbraco.DataLayer.dll</HintPath>
|
||||
<Reference Include="umbraco.DataLayer, Version=1.0.8321.19802, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\umbraco.DataLayer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="umbraco.editorControls, Version=1.0.7180.24671, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\umbraco.editorControls.dll</HintPath>
|
||||
<Reference Include="umbraco.editorControls, Version=1.0.8321.19807, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\umbraco.editorControls.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="umbraco.MacroEngines, Version=1.0.7180.24672, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\umbraco.MacroEngines.dll</HintPath>
|
||||
<Reference Include="umbraco.MacroEngines, Version=1.0.8321.19808, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\umbraco.MacroEngines.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Umbraco.ModelsBuilder, Version=3.0.10.102, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Umbraco.ModelsBuilder.3.0.10\lib\Umbraco.ModelsBuilder.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="umbraco.providers, Version=1.0.7180.24667, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\umbraco.providers.dll</HintPath>
|
||||
<Reference Include="umbraco.providers, Version=1.0.8321.19803, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\umbraco.providers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Umbraco.Web.UI, Version=1.0.7180.24674, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\Umbraco.Web.UI.dll</HintPath>
|
||||
<Reference Include="Umbraco.Web.UI, Version=1.0.8321.19809, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\Umbraco.Web.UI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="UmbracoExamine, Version=0.7.0.24667, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.3\lib\net452\UmbracoExamine.dll</HintPath>
|
||||
<Reference Include="UmbracoExamine, Version=0.7.0.19803, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UmbracoCms.Core.7.15.10\lib\net452\UmbracoExamine.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\UrlRewritingNet.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
|
||||
@@ -587,7 +672,6 @@
|
||||
<Content Include="Backload\Logs\log.folder" />
|
||||
<None Include="compilerconfig.json" />
|
||||
<Content Include="Backload\Release.txt" />
|
||||
<Content Include="Config\BackOfficeTours\getting-started.json" />
|
||||
<Content Include="Config\grid.editors.config.js" />
|
||||
<Content Include="Config\Lang\cs-CZ.user.xml" />
|
||||
<Content Include="Config\Lang\da-DK.user.xml" />
|
||||
@@ -748,20 +832,7 @@
|
||||
<Content Include="Config\imageprocessor\security.config" />
|
||||
<Content Include="Config\imageprocessor\processing.config" />
|
||||
<Content Include="Config\imageprocessor\cache.config" />
|
||||
<Content Include="Media\Web.config" />
|
||||
<Content Include="Config\trees.config" />
|
||||
<Content Include="Config\tinyMceConfig.config" />
|
||||
<Content Include="Config\scripting.config" />
|
||||
<Content Include="Config\HealthChecks.config" />
|
||||
<Content Include="Config\FileSystemProviders.config" />
|
||||
<Content Include="Config\feedProxy.config" />
|
||||
<Content Include="Config\ExamineSettings.config" />
|
||||
<Content Include="Config\ExamineIndex.config" />
|
||||
<Content Include="Config\EmbeddedMedia.config" />
|
||||
<Content Include="Config\Dashboard.config" />
|
||||
<Content Include="Config\BaseRestExtensions.config" />
|
||||
<Content Include="Config\applications.config" />
|
||||
<Content Include="Config\404handlers.config" />
|
||||
<Content Include="Content\bootstrap\_transitions.scss" />
|
||||
<Content Include="fonts\glyphicons-halflings-regular.eot" />
|
||||
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
|
||||
@@ -856,6 +927,20 @@
|
||||
<Content Include="Content\bootstrap\bootstrap.scss" />
|
||||
<Content Include="Content\bootstrap\bootstrap-reboot.scss" />
|
||||
<Content Include="Content\bootstrap\bootstrap-grid.scss" />
|
||||
<Content Include="Media\Web.config" />
|
||||
<Content Include="Config\trees.config" />
|
||||
<Content Include="Config\tinyMceConfig.config" />
|
||||
<Content Include="Config\scripting.config" />
|
||||
<Content Include="Config\HealthChecks.config" />
|
||||
<Content Include="Config\FileSystemProviders.config" />
|
||||
<Content Include="Config\feedProxy.config" />
|
||||
<Content Include="Config\ExamineSettings.config" />
|
||||
<Content Include="Config\ExamineIndex.config" />
|
||||
<Content Include="Config\EmbeddedMedia.config" />
|
||||
<Content Include="Config\BaseRestExtensions.config" />
|
||||
<Content Include="Config\BackOfficeTours\getting-started.json" />
|
||||
<Content Include="Config\applications.config" />
|
||||
<Content Include="Config\404handlers.config" />
|
||||
<None Include="Properties\PublishProfiles\LeafWebUmbraco - Web Deploy.pubxml" />
|
||||
<Content Include="scripts\bootstrap.bundle.js" />
|
||||
<Content Include="scripts\bootstrap.bundle.min.js" />
|
||||
@@ -1045,16 +1130,6 @@
|
||||
<Content Include="Views\MacroPartials\Contact.cshtml" />
|
||||
<Content Include="Views\Shared\DisplayTemplates\_LeafInputStatus.cshtml" />
|
||||
<Content Include="Views\MacroPartials\BannerHeadline.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap2.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap2-Fluid.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Membership\Register.cshtml" />
|
||||
<Content Include="Views\Shared\EditorTemplates\EmailAddress.cshtml" />
|
||||
<Content Include="Views\Shared\EditorTemplates\PasswordWithForgotLink.cshtml" />
|
||||
@@ -1091,6 +1166,16 @@
|
||||
<Content Include="scripts\popper.js.map" />
|
||||
<Content Include="scripts\popper-utils.min.js.map" />
|
||||
<Content Include="scripts\popper-utils.js.map" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap2.cshtml" />
|
||||
<Content Include="Views\Partials\Grid\Bootstrap2-Fluid.cshtml" />
|
||||
<None Include="Web.Debug.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
@@ -1219,16 +1304,16 @@
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
|
||||
<Error Condition="!Exists('..\packages\UmbracoCms.7.15.3\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.15.3\build\UmbracoCms.props'))" />
|
||||
<Error Condition="!Exists('..\packages\UmbracoCms.7.15.3\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.15.3\build\UmbracoCms.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\UmbracoCms.7.15.10\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.15.10\build\UmbracoCms.props'))" />
|
||||
<Error Condition="!Exists('..\packages\UmbracoCms.7.15.10\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.15.10\build\UmbracoCms.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
|
||||
<Import Project="..\packages\UmbracoCms.7.15.3\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.7.15.3\build\UmbracoCms.targets')" />
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
|
||||
<Import Project="..\packages\UmbracoCms.7.15.10\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.7.15.10\build\UmbracoCms.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
+25
-3
@@ -5,7 +5,7 @@
|
||||
<package id="Backload" version="2.2.7" targetFramework="net452" />
|
||||
<package id="Backload.Core" version="2.2.7" targetFramework="net452" />
|
||||
<package id="bootstrap.sass" version="4.6.1" targetFramework="net472" />
|
||||
<package id="ClientDependency" version="1.9.8" targetFramework="net452" />
|
||||
<package id="ClientDependency" version="1.9.9" targetFramework="net472" />
|
||||
<package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net452" />
|
||||
<package id="EntityFramework" version="6.4.4" targetFramework="net472" />
|
||||
<package id="Examine" version="0.1.90" targetFramework="net452" />
|
||||
@@ -63,19 +63,29 @@
|
||||
<package id="ReCaptcha-AspNet" version="1.9.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="semver" version="1.1.2" targetFramework="net452" />
|
||||
<package id="SharpZipLib" version="1.2.0" targetFramework="net452" />
|
||||
<package id="System.AppContext" version="4.1.0" targetFramework="net472" />
|
||||
<package id="System.Buffers" version="4.4.0" targetFramework="net472" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Collections.Immutable" version="1.6.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Console" version="4.0.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Diagnostics.FileVersionInfo" version="4.0.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.StackTrace" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="net472" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
|
||||
<package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net452" />
|
||||
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />
|
||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
|
||||
@@ -83,23 +93,35 @@
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime" version="4.3.1" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Runtime.Handles" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Text.Encoding.CodePages" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Threading.Tasks.Dataflow" version="4.10.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Threading.Thread" version="4.0.0" targetFramework="net472" />
|
||||
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Xml.XmlDocument" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Xml.XPath" version="4.0.1" targetFramework="net472" />
|
||||
<package id="System.Xml.XPath.XDocument" version="4.0.1" targetFramework="net472" />
|
||||
<package id="Umbraco.ModelsBuilder" version="3.0.10" targetFramework="net452" />
|
||||
<package id="UmbracoCms" version="7.15.3" targetFramework="net452" />
|
||||
<package id="UmbracoCms.Core" version="7.15.3" targetFramework="net452" />
|
||||
<package id="UmbracoCms" version="7.15.10" targetFramework="net472" />
|
||||
<package id="UmbracoCms.Core" version="7.15.10" targetFramework="net472" />
|
||||
<package id="UrlRewritingNet" version="2.0.7" targetFramework="net452" />
|
||||
<package id="WebGrease" version="1.6.0" targetFramework="net452" />
|
||||
<package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
|
||||
|
||||
Reference in New Issue
Block a user