release v1.3.4

fex-team · Nov 19, 2014 · 87c12e9 · 87c12e9
2 parents 886d61f + 6f06245
commit 87c12e9
Show file tree

Hide file tree

Showing 32 changed files with 819 additions and 570 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "lib/bower"
+}
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ _drafts/
 native-support/archive/src/tmp/
 native-support/archive/upload/
 ui/theme/default/css/*.css
-ui/theme/default/css/*.css.map
+ui/theme/default/css/*.css.map
+lib/bower/
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,9 @@
 [submodule "lib/fio"]
 	path = lib/fio
 	url = https://github.com/fex-team/fio
+[submodule "lib/umeditor"]
+	path = lib/umeditor
+	url = https://github.com/fex-team/umeditor
+[submodule "lib/marked"]
+	path = lib/marked
+	url = https://github.com/chjj/marked.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 
 # KityMinder 更新日志
 
+## v1.3.4
+
+### 功能更新
+
+1. 支持节点备注（GFM 格式）
+2. 支持更多快捷选择
+3. 支持展开到更多层次的快捷操作
+
 ## v1.3.3
 
 ### 功能更新

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -131,12 +131,21 @@ module.exports = function(grunt) {
                 }]
             },
 
-            noCache: {
+            pageNoCache: {
                 src: distPages,
                 overwrite: true,
                 replacements: [{
-                    from: /src=\"(.+?)\.js\"/ig,
-                    to: 'src="$1.js?_=' + (+new Date()) + '"'
+                    from: /(src|href)=\"(.+?)\.(js|css)\"/ig,
+                    to: '$1="$2.$3?_=' + (+new Date()) + '"'
+                }]
+            },
+
+            imageNoCache: {
+                src: 'dist/ui/theme/default/css/default.all.css',
+                overwrite: true,
+                replacements: [{
+                    from: /\.png/ig,
+                    to: '.png?_=' + (+new Date())
                 }]
             }
         },

diff --git a/bower.json b/bower.json
@@ -0,0 +1,6 @@
+{
+    "name": "kityminder",
+    "dependencies": {
+        "codemirror": "4.7.0"
+    }
+}
diff --git a/edit.html b/edit.html
@@ -26,53 +26,6 @@
     <div id="kityminder" onselectstart="return false">
 
     </div>
-
-    <div id="about">
-        <svg id="km-cat" viewBox="0 0 1200 1200" width="32px" height="32px">
-            <g id="cat-face">
-                <path d="M1066.769,368.482L1119.5,80L830,131.611C760.552,97.29,682.35,77.999,599.641,77.999
-                    c-82.424,0-160.371,19.161-229.641,53.26L81,81l50.769,289l0,0c-33.792,69.019-52.77,146.612-52.77,228.641
-                    c0,287.542,233.099,520.642,520.642,520.642s520.642-233.099,520.642-520.642C1120.282,516.011,1101.028,437.88,1066.769,368.482z"
-                    />
-            </g>
-            <g id="cat-eye">
-                <path style="fill:#FFFFFF;" d="M920.255,371C794.746,371,693,472.746,693,598.255s101.746,227.255,227.255,227.255
-                    s227.255-101.746,227.255-227.255S1045.765,371,920.255,371z M920,746c-80.081,0-145-64.919-145-145s64.919-145,145-145
-                    s145,64.919,145,145S1000.081,746,920,746z"/>
-                <path style="fill:#FFFFFF;" d="M276.255,371C150.746,371,49,472.746,49,598.255s101.746,227.255,227.255,227.255
-                    s227.255-101.746,227.255-227.255S401.765,371,276.255,371z M276,745c-80.081,0-145-64.919-145-145s64.919-145,145-145
-                    s145,64.919,145,145S356.081,745,276,745z"/>
-            </g>
-        </svg>
-        KityMinder 
-        <a id="km-version" 
-           href="https://github.com/fex-team/kityminder/blob/dev/CHANGELOG.md"
-           target="blank"
-           tabindex="-1">
-        </a>
-        under
-        <a href="https://raw.githubusercontent.com/fex-team/kityminder/dev/LICENSE"
-           target="_blank"
-           tabindex="-1">BSD License
-        </a>. 
-        Powered by f-cube, 
-        <a href="http://fex.baidu.com" 
-           target="_blank"
-           tabindex="-1">FEX 
-        </a> |
-        <a href="https://github.com/fex-team/kityminder.git" 
-           target="_blank"
-           tabindex="-1">Source
-        </a>
-        <a href="https://github.com/fex-team/kityminder/issues/new"
-           target="_blank"
-           tabindex="-1">Bug
-        </a> | 
-        <a href="mailto:[email protected]" 
-           target="_blank"
-           tabindex="-1">Contact Us
-        </a>
-    </div>  
 </div>
 </body>
 

diff --git a/import.js b/import.js
@@ -21,6 +21,15 @@
         { path: 'lib/fio/src/fio.js',                   pack: 'index|edit' },
         { path: 'lib/fio/provider/netdisk/oauth.js',    pack: 'index|edit' },
         { path: 'lib/fio/provider/netdisk/netdisk.js',  pack: 'edit' },
+        { path: 'lib/marked/lib/marked.js',             pack: 'edit|share' },
+        { path: 'lib/bower/codemirror/lib/codemirror.js',               pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/xml/xml.js',                 pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/javascript/javascript.js',   pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/css/css.js',                 pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/htmlmixed/htmlmixed.js',     pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/markdown/markdown.js',       pack: 'edit' },
+        { path: 'lib/bower/codemirror/addon/mode/overlay.js',           pack: 'edit' },
+        { path: 'lib/bower/codemirror/mode/gfm/gfm.js',                 pack: 'edit' },
 
         /* Kity 依赖库 */
         { path: 'lib/kity/dist/kity.js',                pack: 'edit|share|m-share' },
@@ -96,6 +105,7 @@
         { path: 'src/module/priority.js',               pack: 'edit|share|m-share' },
         { path: 'src/module/image.js',                  pack: 'edit|share|m-share' },
         { path: 'src/module/resource.js',               pack: 'edit|share|m-share' },
+        { path: 'src/module/note.js',                   pack: 'edit|share|m-share' },
         { path: 'src/module/view.js',                   pack: 'edit|share|m-share' },
         { path: 'src/module/dragtree.js',               pack: 'edit|share|m-share' },
         { path: 'src/module/keynav.js',                 pack: 'edit|share|m-share' },
@@ -200,6 +210,7 @@
         { path: 'ui/ribbon/idea/attachment.js',         pack: 'edit' },
         { path: 'ui/ribbon/idea/link.js',               pack: 'edit' },
         { path: 'ui/ribbon/idea/image.js',              pack: 'edit' },
+        { path: 'ui/ribbon/idea/note.js',               pack: 'edit' },
         { path: 'ui/ribbon/idea/priority.js',           pack: 'edit' },
         { path: 'ui/ribbon/idea/progress.js',           pack: 'edit' },
         { path: 'ui/ribbon/idea/resource.js',           pack: 'edit' },
@@ -214,7 +225,8 @@
 
         /* UI Ribbon「视图」面板 */
         { path: 'ui/ribbon/view/fullscreen.js',         pack: 'edit' },
-        { path: 'ui/ribbon/view/level.js',              pack: 'edit' }
+        { path: 'ui/ribbon/view/level.js',              pack: 'edit' },
+        { path: 'ui/ribbon/view/select.js',             pack: 'edit' }
     ];
 
     if (typeof(module) === 'object' && module.exports) {

diff --git a/import.mobile.share.js b/import.mobile.share.js