changeset 34:27e8e9e38e07 default tip

Слияние
author nickolay
date Wed, 05 Jun 2019 20:44:15 +0300
parents 8af8e840dd49 (diff) 1dc2fd263b90 (current diff)
children
files core/src/js/safe.js src/djol/BaseLayer.js src/djol/ClearTool.js src/djol/CoordPickerTool.js src/djol/DeactivationTool.js src/djol/DistanceMeasureTool.js src/djol/DynamicStyle.js src/djol/IdentificationTool.js src/djol/IdentifyGroup.js src/djol/IdentifyItem.js src/djol/ImageLayer.js src/djol/ImageWMSSource.js src/djol/LayerCheckBox.js src/djol/LayerRadioButton.js src/djol/LayerSwitcher.js src/djol/Map.js src/djol/MeasureToolBase.js src/djol/OSMSource.js src/djol/OlTool.js src/djol/PopupContainer.js src/djol/SquareMeasureTool.js src/djol/TileLayer.js src/djol/TileWMSSource.js src/djol/ToolBoxController.js src/djol/ToolType.js src/djol/VectorLayer.js src/djol/VectorStore.js src/djol/VectorStoreQuery.js src/djol/WFSSource.js src/djol/_OneshotTool.js src/djol/_ToolBase.js src/djol/declare-style.js src/djol/format/coords.js src/djol/format/nls/coords.js src/djol/format/nls/ru/coords.js src/djol/format/nls/ru/units.js src/djol/format/nls/units.js src/djol/interaction/FeatureDrag.js src/djol/listen.js src/djol/main.js src/djol/ol-stub.js src/djol/resources/LayerCheckBoxTemplate.html src/djol/resources/LayerRadioButtonTemplate.html src/djol/resources/LayerSwitcherTemplate.html src/djol/resources/PopupContainerTemplate.html src/djol/resources/mapToolCheckBox.html src/implab/Deferred.js src/implab/Uri.js src/implab/Uuid.js src/implab/components/ActivationController.js src/implab/components/StateMachine.js src/implab/components/_ActivatableMixin.js src/implab/data/DataContext.js src/implab/data/MapSchema.js src/implab/data/ObjectStore.js src/implab/data/RestStore.js src/implab/data/StatefullStoreAdapter.js src/implab/data/StoreAdapter.js src/implab/data/_ModelBase.js src/implab/data/_StatefulModelMixin.js src/implab/data/declare-model.js src/implab/declare.js src/implab/declare/_load.js src/implab/declare/override.js src/implab/di/ActivationContext.js src/implab/di/ActivationError.js src/implab/di/Container.js src/implab/di/Descriptor.js src/implab/di/ReferenceDescriptor.js src/implab/di/ServiceDescriptor.js src/implab/di/ValueDescriptor.js src/implab/dom/css.js src/implab/dom/inject.js src/implab/guard.js src/implab/log/ConsoleLogChannel.js src/implab/log/_LogMixin.js src/implab/log/listeners/console.js src/implab/log/trace.js src/implab/messaging/Client.js src/implab/messaging/Destination.js src/implab/messaging/Listener.js src/implab/messaging/Session.js src/implab/safe.js src/implab/text/format-compile.js src/implab/text/format.js src/implab/text/template-compile.js src/utest/store/mock.js
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/core/src/js/safe.js	Wed Jun 27 04:35:04 2018 +0300
+++ b/core/src/js/safe.js	Wed Jun 05 20:44:15 2019 +0300
@@ -164,10 +164,10 @@
                         if (x && x.then)
                             return x;
                         return {
-                            then : function(cb) {
+                            then: function (cb) {
                                 try {
                                     return cb ? wrapresult(cb(x)) : this;
-                                } catch(e2) {
+                                } catch (e2) {
                                     return wrapresult(e2);
                                 }
                             }
@@ -175,10 +175,12 @@
                     }
                 }
 
-                try {
-                    return wrapresult(fn.apply(thisArg, arguments));
-                } catch (e) {
-                    return wrapresult(null, e);
+                return function () {
+                    try {
+                        return wrapresult(fn.apply(thisArg, arguments));
+                    } catch (e) {
+                        return wrapresult(null, e);
+                    }
                 };
             },