Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@hizzgdev
hizzgdev committed Oct 16, 2023
2 parents 5010d57 + e12bb4f commit b722544
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 27 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ The ES6 version of jsMind has been launched, and legacy version has been depreca
<link
type="text/css"
rel="stylesheet"
href="//cdn.jsdelivr.net/npm/[email protected].1/style/jsmind.css"
href="//cdn.jsdelivr.net/npm/[email protected].2/style/jsmind.css"
/>
<script
type="text/javascript"
src="//cdn.jsdelivr.net/npm/[email protected].1/es6/jsmind.js"
src="//cdn.jsdelivr.net/npm/[email protected].2/es6/jsmind.js"
></script>
<!--
enable draggable node feature
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected].1/es6/jsmind.draggable-node.js"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected].2/es6/jsmind.draggable-node.js"></script>
-->
</head>
<body>
Expand Down
12 changes: 6 additions & 6 deletions docs/en/1.usage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
At first, 2 files (jsmind.css and jsmind.js) are required. Here we link to the resources on the CDN. It is recommended to use the latest version.

```html
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].1/style/jsmind.css" />
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].2/style/jsmind.css" />

<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.js"></script>

```
> CDN: other available CDNs are [jsDelivr](https://www.jsdelivr.com/package/npm/jsmind/), and [the mirror of jsDelivr in China](https://jsd.onmicrosoft.cn/npm/jsmind/). the resource urls would look like:
> - https://unpkg.com/[email protected].1/es6/jsmind.js
> - https://cdn.jsdelivr.net/npm/[email protected].1/es6/jsmind.js
> - https://jsd.onmicrosoft.cn/npm/[email protected].1/es6/jsmind.js
> - https://unpkg.com/[email protected].2/es6/jsmind.js
> - https://cdn.jsdelivr.net/npm/[email protected].2/es6/jsmind.js
> - https://jsd.onmicrosoft.cn/npm/[email protected].2/es6/jsmind.js
> Version: the version number appear in the url of CDN. It's strongly recommended that you also specify the version number in your project to avoid the risks that caused by version upgrades. Access the [Release page](https://github.com/hizzgdev/jsmind/releases) to get the latest version number of jsMind.
Add script jsmind.draggable-node.js for enabling draggable node feature.

```html
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.draggable-node.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.draggable-node.js"></script>
```

The second, a div element should be in your HTML as container
Expand Down
6 changes: 3 additions & 3 deletions docs/en/experimental-features.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ This feature can support to export mind maps as png images.
```html

<!-- style -->
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].1/style/jsmind.css" />
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].2/style/jsmind.css" />

<!-- jsMind -->
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.js"></script>

<!-- dependency of screenshot -->
<script type="text/javascript" src="https://unpkg.com/[email protected]/dist/dom-to-image.min.js" ></script>

<!-- screenshot plugin -->
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.screenshot.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.screenshot.js"></script>


<script>
Expand Down
12 changes: 6 additions & 6 deletions docs/zh/1.usage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@


```html
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].1/style/jsmind.css" />
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].2/style/jsmind.css" />

<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.js"></script>
```

> CDN：其它可用的 CDN 还有 [jsDelivr](https://www.jsdelivr.com/package/npm/jsmind/)，以及 jsDelivr 的[国内镜像](https://jsd.onmicrosoft.cn/npm/jsmind/)。文件路径大概像这样：
> - https://unpkg.com/[email protected].1/es6/jsmind.js
> - https://cdn.jsdelivr.net/npm/[email protected].1/es6/jsmind.js
> - https://jsd.onmicrosoft.cn/npm/[email protected].1/es6/jsmind.js
> - https://unpkg.com/[email protected].2/es6/jsmind.js
> - https://cdn.jsdelivr.net/npm/[email protected].2/es6/jsmind.js
> - https://jsd.onmicrosoft.cn/npm/[email protected].2/es6/jsmind.js
> 版本：上面的示例url中都有版本号，强烈建议你在项目里也指明版本号，以避免版本升级给你的项目带来风险。访问 [Release 页面](https://github.com/hizzgdev/jsmind/releases) 可以获取 jsmind 的最新版本号。
如果希望能够通过鼠标拖拽的方式移动节点，需要额外引用 jsmind.draggable-node.js 文件

```html
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.draggable-node.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.draggable-node.js"></script>
```

其次，要为 jsMind 准备一个容器，jsMind 将在这个容器里显示思维导图。可自行定义容器的id、大小及样式。
Expand Down
6 changes: 3 additions & 3 deletions docs/zh/experimental-features.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
```html

<!-- style -->
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].1/style/jsmind.css" />
<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].2/style/jsmind.css" />

<!-- jsMind -->
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.js"></script>

<!-- dependency of screenshot -->
<script type="text/javascript" src="https://unpkg.com/[email protected]/dist/dom-to-image.min.js" ></script>

<!-- screenshot plugin -->
<script type="text/javascript" src="https://unpkg.com/[email protected].1/es6/jsmind.screenshot.js"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected].2/es6/jsmind.screenshot.js"></script>


<script>
Expand Down
2 changes: 1 addition & 1 deletion example/3_requirejs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
meta: {
name: 'jsMind example',
author: '[email protected]',
version: '0.7.1',
version: '0.7.2',
},
format: 'node_tree',
data: {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsmind",
"version": "0.7.1",
"version": "0.7.2",
"description": "jsMind is a pure javascript library for mindmap, it base on html5 canvas. jsMind was released under BSD license, you can embed it in any project, if only you observe the license.",
"main": "es6/jsmind.js",
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion src/jsmind.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* https://github.com/hizzgdev/jsmind/
*/

export const __version__ = '0.7.1';
export const __version__ = '0.7.2';
export const __author__ = '[email protected]';

if (typeof String.prototype.startsWith != 'function') {
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/jsmind.draggable-node.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ class DraggableNode {
jd.lookup_close_node.call(jd);
}, jd.options.lookup_interval);
}, this.options.lookup_delay);
this.capture = true;
$.w.setTimeout(function () {
jd.capture = true;
}, 0);
}
}
}
Expand Down

0 comments on commit b722544

Please sign in to comment.