fixed bower [main] config

fex-team · Jun 3, 2015 · 3a8df7e · 3a8df7e
1 parent 7c3d8ce
commit 3a8df7e
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 97 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "bower_components"
+}
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 .DS_Store
 bower_components/
 node_modules/
-.tmp/
+.tmp/
diff --git a/bower.json b/bower.json
@@ -1,61 +1,64 @@
 {
-  "name": "km-editor",
-  "version": "1.0.0",
-  "authors": [
-    "fex<[email protected]>"
-  ],
-  "description": "Kity Minder Editor",
-  "main": "kityminder.editor.js",
-  "keywords": [
-    "kityminder",
-    "fex",
-    "ui",
-    "javascript",
-    "html5",
-    "svg"
-  ],
-  "license": "BSD",
-  "homepage": "https://github.com/fex-team/kityminder-editor",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "less",
-    "ui",
-    "src",
-    "Gruntfile.js",
-    "package.json"
-  ],
-  "devDependencies": {
-    "seajs": "~2.3.0"
-  },
-  "dependencies": {
-    "bootstrap": "~3.3.4",
-    "angular": "~1.3.15",
-    "angular-bootstrap": "~0.12.1",
-    "angular-ui-codemirror": "~0.2.3",
-    "codemirror": "~4.8.0",
-    "marked": "~0.3.3",
-    "kity": "~2.0.0",
-    "hotbox": "~1.0.2",
-    "kityminder-core": "~1.4.3",
-    "angular-bootstrap-colorpicker": "~3.0.17"
-  },
-  "overrides": {
-    "codemirror": {
-      "main": [
-        "lib/codemirror.js",
-        "lib/codemirror.css",
-        "mode/xml/xml.js",
-        "mode/javascript/javascript.js",
-        "mode/css/css.js",
-        "mode/htmlmixed/htmlmixed.js",
-        "mode/markdown/markdown.js",
-        "addon/mode/overlay.js",
-        "mode/gfm/gfm.js"
-      ]
+    "name": "kityminder-editor",
+    "version": "1.0.19",
+    "authors": [
+        "fex<[email protected]>"
+    ],
+    "description": "Kity Minder Editor",
+    "main": [
+        "dist/kityminder.editor.js",
+        "dist/kityminder.editor.css"
+    ],
+    "keywords": [
+        "kityminder",
+        "fex",
+        "ui",
+        "javascript",
+        "html5",
+        "svg"
+    ],
+    "license": "BSD",
+    "homepage": "https://github.com/fex-team/kityminder-editor",
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests",
+        "less",
+        "ui",
+        "src",
+        "Gruntfile.js",
+        "package.json"
+    ],
+    "devDependencies": {
+        "seajs": "~2.3.0"
+    },
+    "dependencies": {
+        "bootstrap": "~3.3.4",
+        "angular": "~1.3.15",
+        "angular-bootstrap": "~0.12.1",
+        "angular-ui-codemirror": "~0.2.3",
+        "codemirror": "~4.8.0",
+        "marked": "~0.3.3",
+        "kity": "~2.0.0",
+        "hotbox": "~1.0.2",
+        "kityminder-core": "~1.4.3",
+        "angular-bootstrap-colorpicker": "~3.0.17"
+    },
+    "overrides": {
+        "codemirror": {
+            "main": [
+                "lib/codemirror.js",
+                "lib/codemirror.css",
+                "mode/xml/xml.js",
+                "mode/javascript/javascript.js",
+                "mode/css/css.js",
+                "mode/htmlmixed/htmlmixed.js",
+                "mode/markdown/markdown.js",
+                "addon/mode/overlay.js",
+                "mode/gfm/gfm.js"
+            ]
+        }
     }
-  }
 }
diff --git a/dist/kityminder.editor.js b/dist/kityminder.editor.js
@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * km-editor - v0.0.1 - 2015-05-26
+ * kityminder-editor - v1.0.19 - 2015-06-03
  * https://github.com/fex-team/kityminder-editor
  * GitHub: https://github.com/fex-team/kityminder-editor 
  * Copyright (c) 2015 ; Licensed 
@@ -1279,7 +1279,7 @@ angular.module('kityminderEditor').run(['$templateCache', function($templateCach
 
 
   $templateCache.put('ui/directive/kityminderEditor/kityminderEditor.html',
-    "<div class=\"minder-editor-container\"><div class=\"minder-editor\" ng-style=\"{'right': (config.dividerWidth + config.ctrlPanelWidth) + 'px' }\"></div><div class=\"minder-divider\" minder-divider=\"config\" ng-if=\"minder\" ng-style=\"{'width': config.dividerWidth + 'px', 'right': config.ctrlPanelWidth + 'px'}\"></div><div class=\"control-panel\" control-panel ng-if=\"minder\" ng-style=\"{'width': config.ctrlPanelWidth + 'px'}\"></div><div class=\"note-previewer\" note-previewer ng-if=\"minder\"></div></div>"
+    "<div class=\"minder-editor-container\"><div class=\"minder-editor\" ng-style=\"{'right': (config.dividerWidth + config.ctrlPanelWidth) + 'px' }\"></div><div class=\"minder-divider\" minder-divider=\"config\" minder=\"minder\" ng-if=\"minder\" ng-style=\"{'width': config.dividerWidth + 'px', 'right': config.ctrlPanelWidth + 'px'}\"></div><div class=\"control-panel\" control-panel ng-if=\"minder\" ng-style=\"{'width': config.ctrlPanelWidth + 'px'}\"></div><div class=\"note-previewer\" note-previewer ng-if=\"minder\"></div></div>"
   );
 
 
@@ -1289,20 +1289,13 @@ angular.module('kityminderEditor').run(['$templateCache', function($templateCach
 
 
   $templateCache.put('ui/directive/noteEditor/noteEditor.html',
-    "<div class=\"km-note\" ng-show=\"noteEnabled\" ui-codemirror=\"{ onLoad: codemirrorLoaded }\" ng-model=\"noteContent\" ui-codemirror-opts=\"{\r" +
-    "\n" +
-    "\t\tgfm: true,\r" +
-    "\n" +
-    "\t\tbreaks: true,\r" +
-    "\n" +
-    "\t\tlineWrapping : true,\r" +
-    "\n" +
-    "\t\tmode: 'gfm',\r" +
-    "\n" +
-    "        dragDrop: false,\r" +
-    "\n" +
-    "        lineNumbers:true\r" +
-    "\n" +
+    "<div class=\"km-note\" ng-show=\"noteEnabled\" ui-codemirror=\"{ onLoad: codemirrorLoaded }\" ng-model=\"noteContent\" ui-codemirror-opts=\"{\n" +
+    "\t\tgfm: true,\n" +
+    "\t\tbreaks: true,\n" +
+    "\t\tlineWrapping : true,\n" +
+    "\t\tmode: 'gfm',\n" +
+    "        dragDrop: false,\n" +
+    "        lineNumbers:true\n" +
     "\t }\"></div><p ng-show=\"!noteEnabled\" class=\"km-note-tips\">请选择节点编辑备注</p>"
   );
 
@@ -1977,9 +1970,11 @@ angular.module('kityminderEditor')
 	.directive('minderDivider', ['config', function(config) {
 		return {
 			scope: {
-				config: '=minderDivider'
+				config: '=minderDivider',
+                minder: '='
 			},
 			link: function($scope, element) {
+                var minder = $scope.minder;
 				var ctrlPanelMin = config.getConfig('ctrlPanelMin');
 				var dividerWidth = config.getConfig('dividerWidth');
 
@@ -2010,6 +2005,7 @@ angular.module('kityminderEditor')
 						// 改变父 scope 的变量
 						$scope.config.ctrlPanelWidth = ctrlPanelWidth + deltaX;
 						$scope.$apply();
+                        minder.fire('resize');
 					}
 				});
 

diff --git a/dist/kityminder.editor.min.css b/dist/kityminder.editor.min.css
diff --git a/dist/kityminder.editor.min.js b/dist/kityminder.editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "km-editor",
-  "version": "0.0.1",
+  "name": "kityminder-editor",
+  "version": "1.0.19",
   "description": "A powerful mind map editor",
   "main": "kityminder.editor.js",
   "scripts": {

diff --git a/ui/templates.js b/ui/templates.js