ensure demos to be right

fex-team · Sep 23, 2015 · db46bba · db46bba
1 parent 75548f6
commit db46bba
Show file tree

Hide file tree

Showing 48 changed files with 109 additions and 102 deletions.
diff --git a/demo/README.md b/demo/README.md
@@ -32,16 +32,16 @@ Demo 允许以单个 HTML 页面存在，也可以以目录的形式存在。
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { require('kity'); });
     </script>
     <script>
         // 启动 Demo 模块
-        inc.use('demo');
+        seajs.use('demo');
     </script>
     <!-- dev end -->
 

diff --git a/demo/_sample.html b/demo/_sample.html
@@ -16,16 +16,16 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { require('kity'); });
     </script>
     <script>
         // 启动 Demo 模块
-        inc.use('demo');
+        seajs.use('demo');
     </script>
     <!-- dev end -->
 

diff --git a/demo/chinamap/index.html b/demo/chinamap/index.html
@@ -16,10 +16,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../../dev-lib/dev-define.js"></script>
+    <script src="../../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../../src'} );
+        seajs.config( { base: '../../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { 
             var kity = require('kity'); 
@@ -47,6 +47,6 @@
 <body></body>
 <script>
     // 启动 Demo 模块
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/demo/clock.html b/demo/clock.html
@@ -16,16 +16,16 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { require('kity'); });
     </script>
     <script>
         // 启动 Demo 模块
-        inc.use('demo');
+        seajs.use('demo');
     </script>
     <!-- dev end -->
 

diff --git a/demo/graffle/index.html b/demo/graffle/index.html
@@ -17,10 +17,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../../dev-lib/dev-define.js"></script>
+    <script src="../../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../../src'} );
+        seajs.config( { base: '../../src'} );
     </script>
     <!-- dev end -->
 
@@ -36,7 +36,7 @@
             var Paper = require('core/class').extendClass( require('graphic/paper'), Draggable.prototype );
             var Rect = require('graphic/rect');
             var BezierConnection = require('../demo/graffle/bezierconnection');
-            var PatternBrush = require('graphic/patternbrush');
+            var PatternBrush = require('graphic/pattern');
             var Group = require('graphic/group');
             var Ellipse = require('graphic/ellipse');
             var Color = require('graphic/color');
@@ -229,6 +229,6 @@
 </head>
 <body></body>
 <script>
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/demo/pathdiagram/dataquery.js b/demo/pathdiagram/dataquery.js
@@ -16,7 +16,7 @@ define( function ( require, exports, module ) {
             }
         }
         return ret;
-    } )( require( '../demo/pathdiagram/data' ) );
+    } )( require( '../pathdiagram/data' ) );
 
     var length = data.length;
     var abs = Math.abs;

diff --git a/demo/pathdiagram/index.html b/demo/pathdiagram/index.html
@@ -15,10 +15,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../../dev-lib/dev-define.js"></script>
+    <script src="../../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../../src'} );
+        seajs.config( { base: '../../src'} );
         define('demo', function(require) { require('../demo/pathdiagram/pathdiagram.app'); });
     </script>
     <!-- dev end -->
@@ -34,6 +34,6 @@
 <body></body>
 <script>
     // 启动 Demo 模块
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/demo/pathdiagram/levelcontainer.js b/demo/pathdiagram/levelcontainer.js
@@ -1,12 +1,12 @@
 define( function ( require, exports, module ) {
     var Group = require( 'graphic/group' );
-    var Connection = require( '../demo/graffle/bezierconnection' );
-    var Query = require( '../demo/pathdiagram/dataquery' );
+    var Connection = require( '../graffle/bezierconnection' );
+    var Query = require( '../pathdiagram/dataquery' );
     var Rect = require( 'graphic/rect' );
     var Text = require( 'graphic/text' );
     var TextSpan = require( 'graphic/textspan' );
-    var PathNode = require( '../demo/pathdiagram/pathnode' );
-    var colors = require( '../demo/pathdiagram/colors' );
+    var PathNode = require( '../pathdiagram/pathnode' );
+    var colors = require( '../pathdiagram/colors' );
 
     var rHeight = 25;
     var rWidth = 250;

diff --git a/demo/pathdiagram/pathdiagram.app.js b/demo/pathdiagram/pathdiagram.app.js
@@ -1,8 +1,8 @@
 define(function (require, exports, module) {
     var Class = require('core/class');
     var Paper = require('graphic/paper');
-    var Draggable = require('../demo/public/draggable');
-    var PathDiagram = require('../demo/pathdiagram/pathdiagram');
+    var Draggable = require('../public/draggable');
+    var PathDiagram = require('../pathdiagram/pathdiagram');
 
     Class.extendClass(Paper, Draggable);
 

diff --git a/demo/pathdiagram/pathdiagram.js b/demo/pathdiagram/pathdiagram.js
@@ -1,11 +1,11 @@
 define( function ( require, exports, module ) {
     var Class = require( 'core/class' );
-    var Query = require( '../demo/pathdiagram/dataquery' );
-    var Connection = require( '../demo/graffle/bezierconnection' );
+    var Query = require( '../pathdiagram/dataquery' );
+    var Connection = require( '../graffle/bezierconnection' );
     var Group = require( 'graphic/group' );
     var Text = require( 'graphic/text' );
-    var LevelContainer = require( '../demo/pathdiagram/levelcontainer' );
-    var colors = require( '../demo/pathdiagram/colors' );
+    var LevelContainer = require( '../pathdiagram/levelcontainer' );
+    var colors = require( '../pathdiagram/colors' );
 
     var R_SIZE = LevelContainer.RECT_SIZE;
 

diff --git a/demo/pathdiagram/pathnode.js b/demo/pathdiagram/pathnode.js
@@ -3,7 +3,7 @@ define(function(require, exports, module) {
     var Rect = require('graphic/rect');
     var Text = require('graphic/text');
     var TextSpan = require('graphic/textspan');
-    var colors = require('../demo/pathdiagram/colors');
+    var colors = require('../pathdiagram/colors');
 
     return require('core/class').createClass({
         base: Group,

diff --git a/demo/ps-pen/demo.controller.js b/demo/ps-pen/demo.controller.js
@@ -10,7 +10,7 @@ define( function ( require, exports, module ) {
         Utils = require( "core/utils" ),
         Vector = require( "graphic/vector" ),
         // 引入可绘制的点集合
-        PointGroup = require( "../demo/ps-pen/demo.pointgroup" ),
+        PointGroup = require( "../ps-pen/demo.pointgroup" ),
         BezierPoint = require( "graphic/bezierpoint" );
 
 

diff --git a/demo/ps-pen/demo.start.js b/demo/ps-pen/demo.start.js
@@ -8,14 +8,14 @@ define( function ( require, exports, module ) {
     var Paper = require( "graphic/paper" ),
         Color = require( "graphic/color" ),
         Rect = require( "graphic/rect" ),
-        PatternBrush = require( "graphic/patternbrush" );
+        PatternBrush = require( "graphic/pattern" );
 
     // 程序变量
     var paper = null,
         //zoom倍数
         ZOOM = 100,
         controller = null,
-        Controller = require( "../demo/ps-pen/demo.controller" );
+        Controller = require( "../ps-pen/demo.controller" );
 
     function init () {
 

diff --git a/demo/ps-pen/index.html b/demo/ps-pen/index.html
@@ -16,10 +16,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../../dev-lib/dev-define.js"></script>
+    <script src="../../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../../src'} );
+        seajs.config( { base: '../../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { require('../demo/ps-pen/demo.start'); });
     </script>
@@ -40,6 +40,6 @@
 </body>
 <script>
     // 启动 Demo 模块
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/demo/public/draggable.js b/demo/public/draggable.js
@@ -114,8 +114,8 @@ define( function ( require, exports, module ) {
                 bindEvents( me.getPaper() );
             } else {
                 var listener = function ( e ) {
-                    if ( e.targetShape.getPaper() ) {
-                        bindEvents( e.targetShape.getPaper() );
+                    if ( e.target.getPaper() ) {
+                        bindEvents( e.target.getPaper() );
                         me.off( 'add', listener );
                         me.off( 'treeadd', listener );
                     }

diff --git a/demo/ringpalette/index.html b/demo/ringpalette/index.html
@@ -16,10 +16,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../../dev-lib/dev-define.js"></script>
+    <script src="../../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../../src'} );
+        seajs.config( { base: '../../src'} );
         // 定义 Demo 模块
         define('demo', function(require) {
             var Paper = require('graphic/paper');
@@ -42,6 +42,6 @@
 </head>
 <body></body>
 <script>
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/demo/ringpalette/ringpalette.js b/demo/ringpalette/ringpalette.js
@@ -6,8 +6,8 @@ define(function(require, exports, module) {
     var Text = require('graphic/text');
     var Pen = require('graphic/pen');
     var Matrix = require('graphic/matrix');
-    var Pie = require('../demo/ringpalette/pie');
-    var Draggable = require('../demo/public/draggable');
+    var Pie = require('../ringpalette/pie');
+    var Draggable = require('../public/draggable');
 
     return require('core/class').createClass({
         base: Group,

diff --git a/demo/texteditor.html b/demo/texteditor.html
@@ -16,16 +16,16 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
         // 定义 Demo 模块
         define('demo', function(require) { require('kity'); });
     </script>
     <script>
         // 启动 Demo 模块
-        inc.use('demo');
+        seajs.use('demo');
     </script>
     <!-- dev 版本 示例所需脚本文件 end -->
 

diff --git a/demo/threebody.html b/demo/threebody.html
@@ -16,10 +16,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
         // 定义 Demo 模块
         define('demo', function(require) {
             var kity = require('kity');
@@ -31,7 +31,7 @@
     </script>
     <script>
         // 启动 Demo 模块
-        inc.use('demo');
+        seajs.use('demo');
     </script>
     <!-- dev end -->
 

diff --git a/demo/viewport.html b/demo/viewport.html
@@ -16,10 +16,10 @@
     <!-- Demo 开发过程中使用 CMD 引入 Kity 源码，方便调试 -->
     <!-- dev start -->
     <!-- 目录型的 Demo 注意修正源码引用路径 -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
         // 设置好 kity 源代码目录
-        inc.config( { base: '../src'} );
+        seajs.config( { base: '../src'} );
 
         // 定义 Demo 模块
         define('demo', function(require) { 
@@ -90,6 +90,6 @@
 <body></body>
 <script>
     // 启动 Demo 模块
-    inc.use('demo');
+    seajs.use('demo');
 </script>
 </html>
diff --git a/dev-lib/dev-define.js b/dev-lib/dev-define.js
@@ -31,7 +31,7 @@
 
     };
 
-    global.use = global.inc.use;
+    global.use = global.seajs.use;
 
     global.define = function(id, deps, f) {
 

diff --git a/dev-lib/dev-start.js b/dev-lib/dev-start.js
@@ -0,0 +1,5 @@
+/**
+ * Created by hn on 13-12-4.
+ */
+// 启动脚本
+seajs.use( 'kity.start' );
diff --git a/dev-lib/sea.js b/dev-lib/sea.js
diff --git a/example/boundarybox.html b/example/boundarybox.html
@@ -5,9 +5,9 @@
     <!-- 正式发布的时候， 只需替换掉相应的脚本文件即可 -->
 
     <!-- dev 版本 示例所需脚本文件 start -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
-        inc.config({
+        seajs.config({
             base: '../src'
         });
     </script>

diff --git a/example/clip.html b/example/clip.html
@@ -6,9 +6,9 @@
     <!-- 正式发布的时候， 只需替换掉相应的脚本文件即可 -->
 
     <!-- dev 版本 示例所需脚本文件 start -->
-    <script src="../dev-lib/dev-define.js"></script>
+    <script src="../dev-lib/sea.js"></script>
     <script>
-        inc.config({
+        seajs.config({
             base: '../src'
         });
     </script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ @@
         };
-        global.use = global.inc.use;
+        global.use = global.seajs.use;
         global.define = function(id, deps, f) {
@@ Expand Down @@