Merge pull request #1869 from ONLYOFFICE/fix/bugfix
[SSE] Set minimum zoom value to 10%
This commit is contained in:
		
						commit
						388bf95abf
					
				| 
						 | 
					@ -321,7 +321,7 @@ SSE.ApplicationController = new(function(){
 | 
				
			||||||
            if (api){
 | 
					            if (api){
 | 
				
			||||||
                var f = Math.ceil(api.asc_getZoom() * 10)/10;
 | 
					                var f = Math.ceil(api.asc_getZoom() * 10)/10;
 | 
				
			||||||
                f -= .1;
 | 
					                f -= .1;
 | 
				
			||||||
                !(f < .5) && api.asc_setZoom(f);
 | 
					                !(f < .1) && api.asc_setZoom(f);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1857,7 +1857,7 @@ define([
 | 
				
			||||||
                    if (delta < 0) {
 | 
					                    if (delta < 0) {
 | 
				
			||||||
                        factor = Math.ceil(factor * 10)/10;
 | 
					                        factor = Math.ceil(factor * 10)/10;
 | 
				
			||||||
                        factor -= 0.1;
 | 
					                        factor -= 0.1;
 | 
				
			||||||
                        if (!(factor < .5)) {
 | 
					                        if (!(factor < .1)) {
 | 
				
			||||||
                            this.api.asc_setZoom(factor);
 | 
					                            this.api.asc_setZoom(factor);
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    } else if (delta > 0) {
 | 
					                    } else if (delta > 0) {
 | 
				
			||||||
| 
						 | 
					@ -1897,7 +1897,7 @@ define([
 | 
				
			||||||
                        if (!this.api.isCellEdited) {
 | 
					                        if (!this.api.isCellEdited) {
 | 
				
			||||||
                            factor = Math.ceil(this.api.asc_getZoom() * 10)/10;
 | 
					                            factor = Math.ceil(this.api.asc_getZoom() * 10)/10;
 | 
				
			||||||
                            factor -= .1;
 | 
					                            factor -= .1;
 | 
				
			||||||
                            if (!(factor < .5)) {
 | 
					                            if (!(factor < .1)) {
 | 
				
			||||||
                                this.api.asc_setZoom(factor);
 | 
					                                this.api.asc_setZoom(factor);
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -154,7 +154,9 @@ define([
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        applyZoom: function (value) {
 | 
					        applyZoom: function (value) {
 | 
				
			||||||
            var val = Math.max(25, Math.min(500, value));
 | 
					            var val = Math.max(10, Math.min(500, value));
 | 
				
			||||||
 | 
					            if (this._state.zoomValue === val)
 | 
				
			||||||
 | 
					                this.view.cmbZoom.setValue(this._state.zoomValue, this._state.zoomValue + '%');
 | 
				
			||||||
            this.api.asc_setZoom(val/100);
 | 
					            this.api.asc_setZoom(val/100);
 | 
				
			||||||
            Common.NotificationCenter.trigger('edit:complete', this.view);
 | 
					            Common.NotificationCenter.trigger('edit:complete', this.view);
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue