Merge branch 'master' into deploy
This commit is contained in:
		@@ -38,7 +38,6 @@
 | 
				
			|||||||
    "axios": "0.18.0",
 | 
					    "axios": "0.18.0",
 | 
				
			||||||
    "clipboard": "1.7.1",
 | 
					    "clipboard": "1.7.1",
 | 
				
			||||||
    "codemirror": "5.39.2",
 | 
					    "codemirror": "5.39.2",
 | 
				
			||||||
    "connect": "3.6.6",
 | 
					 | 
				
			||||||
    "driver.js": "0.8.1",
 | 
					    "driver.js": "0.8.1",
 | 
				
			||||||
    "dropzone": "5.2.0",
 | 
					    "dropzone": "5.2.0",
 | 
				
			||||||
    "echarts": "4.1.0",
 | 
					    "echarts": "4.1.0",
 | 
				
			||||||
@@ -79,6 +78,7 @@
 | 
				
			|||||||
    "babel-preset-stage-2": "6.24.1",
 | 
					    "babel-preset-stage-2": "6.24.1",
 | 
				
			||||||
    "chalk": "2.4.1",
 | 
					    "chalk": "2.4.1",
 | 
				
			||||||
    "compression-webpack-plugin": "2.0.0",
 | 
					    "compression-webpack-plugin": "2.0.0",
 | 
				
			||||||
 | 
					    "connect": "3.6.6",
 | 
				
			||||||
    "copy-webpack-plugin": "4.5.2",
 | 
					    "copy-webpack-plugin": "4.5.2",
 | 
				
			||||||
    "cross-env": "5.2.0",
 | 
					    "cross-env": "5.2.0",
 | 
				
			||||||
    "css-loader": "1.0.0",
 | 
					    "css-loader": "1.0.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,6 +14,9 @@ export default {
 | 
				
			|||||||
      isFullscreen: false
 | 
					      isFullscreen: false
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  mounted() {
 | 
				
			||||||
 | 
					    this.init()
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  methods: {
 | 
					  methods: {
 | 
				
			||||||
    click() {
 | 
					    click() {
 | 
				
			||||||
      if (!screenfull.enabled) {
 | 
					      if (!screenfull.enabled) {
 | 
				
			||||||
@@ -23,12 +26,17 @@ export default {
 | 
				
			|||||||
        })
 | 
					        })
 | 
				
			||||||
        return false
 | 
					        return false
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      screenfull.toggle().then(() => {
 | 
					      screenfull.toggle()
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    init() {
 | 
				
			||||||
 | 
					      if (screenfull.enabled) {
 | 
				
			||||||
 | 
					        screenfull.on('change', () => {
 | 
				
			||||||
          this.isFullscreen = screenfull.isFullscreen
 | 
					          this.isFullscreen = screenfull.isFullscreen
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
</script>
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<style scoped>
 | 
					<style scoped>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user