简柏林 / thingskit-scada · Commits

Commit fa69ba668ef1896e286c3d66e8251b72504fe628

Authored by ww
1 parent 84ebe1b5

perf: hidde fit button && print button

Inline Side-by-side
Showing 3 changed files with 29 additions and 27 deletions
... ... @@ -563,7 +563,7 @@
563 563 <body class="geEditor">
564 564 <div id="geInfo">
565 565 <div class="geBlock">
566   - <h1>ThingsKit云组态启动中.......</h1>
  566 + <h1>ThingsKit云组态启动中，请耐心等待</h1>
567 567 </div>
568 568 <figure>
569 569 <div class="dot white"></div>
... ...
... ... @@ -664,7 +664,7 @@ App.main = function(callback, createUi)
664 664 var content = mxUtils.getTextContent(scripts[scripts.length - 1]);
665 665
666 666 // if (CryptoJS.MD5(content).toString() != 'd53805dd6f0bbba2da4966491ca0a505')
667   - if (CryptoJS.MD5(content).toString() != 'ce6aa7729ae06957ca56e510739b70b3')
  667 + if (CryptoJS.MD5(content).toString() != 'c4cfc8a77f5990a4d86c0fbc4443328b')
668 668 {
669 669 console.log('Change main script MD5 in the previous line:', CryptoJS.MD5(content).toString());
670 670 alert('[Dev] Main script change requires update of CSP');
... ...
... ... @@ -2570,28 +2570,29 @@ EditorUi.prototype.initCanvas = function()
2570 2570 mxEvent.consume(evt);
2571 2571 }), Editor.zoomInImage, mxResources.get('zoomIn') + ' (Alt+Mousewheel)');
2572 2572
2573   - addButton(mxUtils.bind(this, function(evt)
2574   - {
2575   - if (graph.isLightboxView())
2576   - {
2577   - if (graph.view.scale == 1)
2578   - {
2579   - this.lightboxFit();
2580   - }
2581   - else
2582   - {
2583   - graph.zoomTo(1);
2584   - }
  2573 + // TODO thingsKit 隐藏自适应按钮
  2574 + // addButton(mxUtils.bind(this, function(evt)
  2575 + // {
  2576 + // if (graph.isLightboxView())
  2577 + // {
  2578 + // if (graph.view.scale == 1)
  2579 + // {
  2580 + // this.lightboxFit();
  2581 + // }
  2582 + // else
  2583 + // {
  2584 + // graph.zoomTo(1);
  2585 + // }
2585 2586
2586   - this.chromelessResize(false);
2587   - }
2588   - else
2589   - {
2590   - this.chromelessResize(true);
2591   - }
  2587 + // this.chromelessResize(false);
  2588 + // }
  2589 + // else
  2590 + // {
  2591 + // this.chromelessResize(true);
  2592 + // }
2592 2593
2593   - mxEvent.consume(evt);
2594   - }), Editor.zoomFitImage, mxResources.get('fit'));
  2594 + // mxEvent.consume(evt);
  2595 + // }), Editor.zoomFitImage, mxResources.get('fit'));
2595 2596
2596 2597 // Changes toolbar opacity on hover
2597 2598 var fadeThread = null;
... ... @@ -3300,11 +3301,12 @@ EditorUi.prototype.initCanvas = function()
3300 3301 */
3301 3302 EditorUi.prototype.addChromelessToolbarItems = function(addButton)
3302 3303 {
3303   - addButton(mxUtils.bind(this, function(evt)
3304   - {
3305   - this.actions.get('print').funct();
3306   - mxEvent.consume(evt);
3307   - }), Editor.printImage, mxResources.get('print'));
  3304 + // TODO thingsKit 隐藏预览打印按钮
  3305 + // addButton(mxUtils.bind(this, function(evt)
  3306 + // {
  3307 + // this.actions.get('print').funct();
  3308 + // mxEvent.consume(evt);
  3309 + // }), Editor.printImage, mxResources.get('print'));
3308 3310 };
3309 3311
3310 3312 /**
... ...