1.恢复到之前的版本

fex-team · Apr 3, 2015 · 94ff26a · 94ff26a
1 parent b7c01ad
commit 94ff26a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/index.html b/index.html
@@ -24,7 +24,7 @@
 
             /* 初始化网盘使用的 APP 身份 */
             fio.user.init({
-                apiKey: 'IF1PQMDsNy2iy0GKCx084qdx'  //微行平台Key
+                apiKey: 'wiE55BGOG8BkGnpPs6UNtPbb'
             });
 
             var $a = $('p.login a').hide();

diff --git a/src/module/outline.js b/src/module/outline.js
@@ -15,6 +15,7 @@ var OutlineRenderer = kity.createClass('OutlineRenderer', {
     },
 
     update: function(outline, node, box) {
+        //增加圆形update、待更好解决方案
         var shape = node.getStyle('shape');
         if(shape){
             if(shape=='circle'){
@@ -35,7 +36,8 @@ var OutlineRenderer = kity.createClass('OutlineRenderer', {
 
         var prefix = node.isSelected() ? 'selected-' : '';
 
-        outline.setPosition(outlineBox.x, outlineBox.y)
+        outline
+            .setPosition(outlineBox.x, outlineBox.y)
             .setSize(outlineBox.width, outlineBox.height)
             .setRadius(node.getStyle('radius'))
             .fill(node.getData('background') || node.getStyle(prefix + 'background') || node.getStyle('background'))
@@ -68,7 +70,8 @@ function updateCircle(outline, node, box){
 
     width= Math.max(outlineBox.width,outlineBox.height);
 
-    outline.setPosition(outlineBox.x, outlineBox.y)
+    outline
+        .setPosition(outlineBox.x, outlineBox.y)
         .setSize(width, width)
         .setRadius(width/2)
         .fill(node.getData('background') || node.getStyle(prefix + 'background') || node.getStyle('background'))
@@ -91,7 +94,9 @@ var ShadowRenderer = kity.createClass('ShadowRenderer', {
     },
 
     update: function(shadow, node, box) {
-        shadow.setPosition(box.x + 4, box.y + 5).fill(node.getStyle('shadow'));
+        shadow
+            .setPosition(box.x + 4, box.y + 5)
+            .fill(node.getStyle('shadow'));
 
         var shape = node.getStyle('shape');
         if(!shape){

diff --git a/src/module/text.js b/src/module/text.js
@@ -14,6 +14,7 @@ var TextRenderer = KityMinder.TextRenderer = kity.createClass('TextRenderer', {
     },
 
     update: function(textGroup, node) {
+
         function s(name) {
             return node.getData(name) || node.getStyle(name);
         }
@@ -69,8 +70,7 @@ var TextRenderer = KityMinder.TextRenderer = kity.createClass('TextRenderer', {
 
         var textHash = node.getText() + [s('font-size'), s('font-name'), s('font-weight'), s('font-style')].join('/');
 
-        if (node._currentTextHash == textHash && node._currentTextGroupBox)
-            return node._currentTextGroupBox;
+        if (node._currentTextHash == textHash && node._currentTextGroupBox) return node._currentTextGroupBox;
 
         node._currentTextHash = textHash;
 

diff --git a/ui/theme/default/css/_quickvisit.less b/ui/theme/default/css/_quickvisit.less
@@ -36,7 +36,6 @@
     }
 
     &.share {
-        margin-right: 5px;
         &:after {
             background-position: 0 -945px;
         }

diff --git a/ui/topbar/feedback.js b/ui/topbar/feedback.js
@@ -6,7 +6,7 @@
  * @author: techird
  * @copyright: Baidu FEX, 2014
  */
-KityMinder.registerUI('topbar/feedback', function (minder) {
+KityMinder.registerUI('topbar/feedback', function(minder) {
     var $quickvisit = minder.getUI('topbar/quickvisit');
 
     var $feedback = $quickvisit.add('feedback', 'right');
@@ -16,7 +16,6 @@ KityMinder.registerUI('topbar/feedback', function (minder) {
         $menu.$tabs.select(5);
         $menu.show();
     }
-
     $feedback.click(quickFeedback);
     minder.addShortcut('f1', quickFeedback);