diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index cec805653..0c7cfade3 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -378,6 +378,7 @@ define([ e.preventDefault(); e.stopPropagation(); resetPageX(e); + me.mouseFree = true; var index = e.data.index, lastValue = me.thumbs[index].value, @@ -405,7 +406,6 @@ define([ $(document).off('mouseup', me.binding.onMouseUp); $(document).off('mousemove', me.binding.onMouseMove); - me.mouseFree = true; me._dragstart = undefined; !me.isRemoveThumb && me.trigger('changecomplete', me, value, lastValue); me.isRemoveThumb = undefined; diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 53391fbeb..9e56ed570 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -994,7 +994,7 @@ define([ } else me.mnuDirectionPicker.dataViewItems.forEach(function (item){ - var type = item.options.model.attributes.type+90; + var type = item.model.get('type')+90; item.$el.children(0).css({'background': 'linear-gradient('+ type + 'deg, '+ me.gradientColorsStr + ')'}); }); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 5da359ca0..34e88cd0e 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -539,7 +539,7 @@ define([ this.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + gradientColorsStr + ')'}); else this.mnuDirectionPicker.dataViewItems.forEach(function (item) { - var type = item.options.model.attributes.type + 90; + var type = item.model.get('type') + 90; item.$el.children(0).css({'background': 'linear-gradient(' + type + 'deg, ' + gradientColorsStr + ')'}); }); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index e397a522b..cf3e8672d 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -615,7 +615,7 @@ define([ this.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + gradientColorsStr + ')'}); else this.mnuDirectionPicker.dataViewItems.forEach(function (item) { - var type = item.options.model.attributes.type + 90; + var type = item.model.get('type') + 90; item.$el.children(0).css({'background': 'linear-gradient(' + type + 'deg, ' + gradientColorsStr + ')'}); }); diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 96893a739..92ac88154 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -950,7 +950,7 @@ define([ me.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + me.gradientColorsStr + ')'}); else me.mnuDirectionPicker.dataViewItems.forEach(function (item){ - var type = item.options.model.attributes.type+90; + var type = item.model.get('type')+90; item.$el.children(0).css({'background': 'linear-gradient('+ type + 'deg, '+ me.gradientColorsStr + ')'}); }); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 2691552ac..c737aab48 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -929,7 +929,7 @@ define([ me.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + me.gradientColorsStr + ')'}); else me.mnuDirectionPicker.dataViewItems.forEach(function (item){ - var type = item.options.model.attributes.type+90; + var type = item.model.get('type')+90; item.$el.children(0).css({'background': 'linear-gradient('+ type + 'deg, '+ me.gradientColorsStr + ')'}); });