diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8c5c6fc --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "{}" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright 2017 ColinTree + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 0d741db..e7c0930 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,11 @@ It is actually creating workspace for each block, and then resize the workspace ## Plugin Config -* **text_when** text `when` for events -* **text_do** text `do` for events * **text_call** text `call` for methods +* **text_do** text `do` for events * **text_set** text `set` for properties +* **text_when** text `when` for events +* **scale_level** scale level for all blocks e.g. @@ -21,10 +22,11 @@ e.g. ], "pluginsConfig": { "ai2-blocks": { - "text_when": "when", - "text_do": "do", "text_call": "call", - "text_set": "set" + "text_do": "do", + "text_set": "set", + "text_when": "when", + "scale_level": 0.9 } } } @@ -40,6 +42,8 @@ e.g. {% Ai2Method %}{"name":"MethodName2", "arg":["arg1","arg2"], "output":true}{% endAi2Method %} +{% Ai2Method %}{"name":"MethodName2", "arg":["arg1","arg2"], "output":true, "scale":0.9}{% endAi2Method %} + {% Ai2Event %}{"name":"EventName", "componentName":"compName2", "arg":["arg1","arg2"]}{% endAi2Event %} {% Ai2Property %}{"name":"PropertyName", "componentName":"compName3", "getter":true}{% endAi2Property %} @@ -49,8 +53,4 @@ e.g. will be converted into: -![](example.png) - -## Further Plan - -* allowing scaling blocks \ No newline at end of file +![](example.png) \ No newline at end of file diff --git a/assets/plugin.js b/assets/plugin.js index 0d7dac2..6133556 100644 --- a/assets/plugin.js +++ b/assets/plugin.js @@ -11,6 +11,7 @@ var TEXT_WHEN = 'when'; var TEXT_DO = 'do'; var TEXT_CALL = 'call'; var TEXT_SET = 'set'; +var SCALE_LEVEL = 1; // will be increased automatically by getBlock(json) var blockIndex = 0; @@ -24,6 +25,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { TEXT_DO = conf['ai2-blocks']['text_do'] || TEXT_DO; TEXT_CALL = conf['ai2-blocks']['text_call'] || TEXT_CALL; TEXT_SET = conf['ai2-blocks']['text_set'] || TEXT_SET; + SCALE_LEVEL = conf['ai2-blocks']['scale_level'] || SCALE_LEVEL; // METHOD $('div[ai2-method]').each(function(){ @@ -32,6 +34,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { var name = block['name']; var arg = block['arg'] || []; var output = block['output']===true; + var scale = block['scale'] || SCALE_LEVEL; $(this).attr('id', blockId).show(); @@ -54,7 +57,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { } }; - newBlockAndWorkspace(blockId).moveBy(output?8:0, 0); + newBlockAndWorkspace(blockId, scale).moveBy(output?8:0, 0); }); // EVENT @@ -63,6 +66,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { var name = block['name']; var arg = block['arg'] || []; + var scale = block['scale'] || SCALE_LEVEL; $(this).attr('id', blockId).show(); @@ -85,7 +89,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { } }; - newBlockAndWorkspace(blockId); + newBlockAndWorkspace(blockId, scale); }); // PROPERTY @@ -97,6 +101,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { if (getter !== true && getter !== false) { getter = true; } + var scale = block['scale'] || SCALE_LEVEL; $(this).attr('id', blockId).show(); @@ -120,7 +125,7 @@ require(['gitbook', 'jQuery'], function(gitbook, $) { } }; - newBlockAndWorkspace(blockId).moveBy((getter?8:0), 0); + newBlockAndWorkspace(blockId, scale).moveBy((getter?8:0), 0); }); }); }); @@ -144,19 +149,19 @@ function getBlock(json) { return blockData; } -function newBlockAndWorkspace(id) { +function newBlockAndWorkspace(id, scale) { var workspace = Blockly.inject(id, { toolbox: false, trashcan: false, readOnly: true, - scrollbars: false, - startScale: 0.5 + scrollbars: false }); + workspace.setScale(scale); var block = workspace.newBlock('dynamicCreated_'+id); block.initSvg(); block.render(); - + var metrics = workspace.getMetrics(); $("#"+id).height(metrics.contentHeight).width(metrics.contentWidth); Blockly.svgResize(workspace); diff --git a/example.png b/example.png index e886cd4..5ac8fed 100644 Binary files a/example.png and b/example.png differ diff --git a/package.json b/package.json index 0c40252..9d5cb38 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "author": "ColinTree", + "author": "ColinTree <502470184@qq.com>", "bugs": { "url": "https://github.com/ColinTree/gitbook-plugin-ai2-blocks/issues" }, @@ -9,25 +9,30 @@ }, "gitbook": { "property": { - "text_when": { - "type": "string", - "default": "when", - "description": "text \"when\" for events" + "text_call": { + "default": "call", + "description": "text \"call\" for methods", + "type": "string" }, "text_do": { - "type": "string", - "default": "do", - "description": "text \"do\" for events" - }, - "text_call": { - "type": "string", - "default": "call", - "description": "text \"call\" for methods" + "default": "do", + "description": "text \"do\" for events", + "type": "string" }, "text_set": { - "type": "string", - "default": "set", - "description": "text \"set\" for properties" + "default": "set", + "description": "text \"set\" for properties", + "type": "string" + }, + "text_when": { + "default": "when", + "description": "text \"when\" for events", + "type": "string" + }, + "scale_level": { + "default": 1.0, + "description": "scale level for all blocks", + "type": "number" } } }, @@ -35,8 +40,8 @@ "main": "index.js", "maintainers": [ { - "name": "ColinTree", - "email": "502470184@qq.com" + "email": "502470184@qq.com", + "name": "ColinTree" } ], "name": "gitbook-plugin-ai2-blocks", @@ -45,5 +50,5 @@ "type": "git", "url": "git+https://github.com/ColinTree/gitbook-plugin-ai2-blocks.git" }, - "version": "0.2.1" + "version": "0.3.1" } \ No newline at end of file