diff --git a/demo/README.md b/demo/README.md index 57a1a7d..3e5d7ce 100644 --- a/demo/README.md +++ b/demo/README.md @@ -32,16 +32,16 @@ Demo 允许以单个 HTML 页面存在，也可以以目录的形式存在。 - + diff --git a/demo/_sample.html b/demo/_sample.html index 5cee565..d0b7cad 100644 --- a/demo/_sample.html +++ b/demo/_sample.html @@ -16,16 +16,16 @@ - + diff --git a/demo/chinamap/index.html b/demo/chinamap/index.html index b193a49..65552cd 100644 --- a/demo/chinamap/index.html +++ b/demo/chinamap/index.html @@ -16,10 +16,10 @@ - + \ No newline at end of file diff --git a/demo/clock.html b/demo/clock.html index 13a60d1..55d1b08 100644 --- a/demo/clock.html +++ b/demo/clock.html @@ -16,16 +16,16 @@ - + diff --git a/demo/graffle/index.html b/demo/graffle/index.html index ca01af8..aaa67b8 100644 --- a/demo/graffle/index.html +++ b/demo/graffle/index.html @@ -17,10 +17,10 @@ - + @@ -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 @@ \ No newline at end of file diff --git a/demo/pathdiagram/dataquery.js b/demo/pathdiagram/dataquery.js index 21b3b5c..1100070 100644 --- 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 index b327514..a9aa0c7 100644 --- a/demo/pathdiagram/index.html +++ b/demo/pathdiagram/index.html @@ -15,10 +15,10 @@ - + @@ -34,6 +34,6 @@ \ No newline at end of file diff --git a/demo/pathdiagram/levelcontainer.js b/demo/pathdiagram/levelcontainer.js index 1439d84..ba09a1e 100644 --- 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 index f507d41..53e64b7 100644 --- 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 index 8219814..105f370 100644 --- 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 index cd7bddb..8714b04 100644 --- 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 index c4de2c7..f83b194 100644 --- 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 index 8df57b0..84c17e1 100644 --- 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 index 146b07b..460f3ce 100644 --- a/demo/ps-pen/index.html +++ b/demo/ps-pen/index.html @@ -16,10 +16,10 @@ - + @@ -40,6 +40,6 @@ \ No newline at end of file diff --git a/demo/public/draggable.js b/demo/public/draggable.js index 8d706a0..4ccabdc 100644 --- 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 index 2fc4aa6..6a885ba 100644 --- a/demo/ringpalette/index.html +++ b/demo/ringpalette/index.html @@ -16,10 +16,10 @@ - + \ No newline at end of file diff --git a/demo/ringpalette/ringpalette.js b/demo/ringpalette/ringpalette.js index 6cc8958..dbfce47 100644 --- 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 index 7a8b7af..446b978 100644 --- a/demo/texteditor.html +++ b/demo/texteditor.html @@ -16,16 +16,16 @@ - + diff --git a/demo/threebody.html b/demo/threebody.html index ca57c9b..340ab54 100644 --- a/demo/threebody.html +++ b/demo/threebody.html @@ -16,10 +16,10 @@ - + diff --git a/demo/viewport.html b/demo/viewport.html index b089ba9..d2f18b2 100644 --- a/demo/viewport.html +++ b/demo/viewport.html @@ -16,10 +16,10 @@ - + \ No newline at end of file diff --git a/dev-lib/dev-define.js b/dev-lib/dev-define.js index 40f46ad..29e078b 100644 --- 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 new file mode 100644 index 0000000..54789b1 --- /dev/null +++ b/dev-lib/dev-start.js @@ -0,0 +1,5 @@ +/** + * Created by hn on 13-12-4. + */ +// 启动脚本 +seajs.use( 'kity.start' ); \ No newline at end of file diff --git a/dev-lib/sea.js b/dev-lib/sea.js new file mode 100644 index 0000000..3a54f36 --- /dev/null +++ b/dev-lib/sea.js @@ -0,0 +1,2 @@ +/*! Sea.js 2.3.0 | seajs.org/LICENSE.md */ +!function(a,b){function c(a){return function(b){return{}.toString.call(b)=="[object "+a+"]"}}function d(){return z++}function e(a){return a.match(C)[0]}function f(a){for(a=a.replace(D,"/"),a=a.replace(F,"$1/");a.match(E);)a=a.replace(E,"/");return a}function g(a){var b=a.length-1,c=a.charAt(b);return"#"===c?a.substring(0,b):".js"===a.substring(b-2)||a.indexOf("?")>0||"/"===c?a:a+".js"}function h(a){var b=u.alias;return b&&w(b[a])?b[a]:a}function i(a){var b=u.paths,c;return b&&(c=a.match(G))&&w(b[c[1]])&&(a=b[c[1]]+c[2]),a}function j(a){var b=u.vars;return b&&a.indexOf("{")>-1&&(a=a.replace(H,function(a,c){return w(b[c])?b[c]:a})),a}function k(a){var b=u.map,c=a;if(b)for(var d=0,e=b.length;e>d;d++){var f=b[d];if(c=y(f)?f(a)||a:a.replace(f[0],f[1]),c!==a)break}return c}function l(a,b){var c,d=a.charAt(0);if(I.test(a))c=a;else if("."===d)c=f((b?e(b):u.cwd)+a);else if("/"===d){var g=u.cwd.match(J);c=g?g[0]+a.substring(1):a}else c=u.base+a;return 0===c.indexOf("//")&&(c=location.protocol+c),c}function m(a,b){if(!a)return"";a=h(a),a=i(a),a=j(a),a=g(a);var c=l(a,b);return c=k(c)}function n(a){return a.hasAttribute?a.src:a.getAttribute("src",4)}function o(a,b,c){var d=K.createElement("script");if(c){var e=y(c)?c(a):c;e&&(d.charset=e)}p(d,b,a),d.async=!0,d.src=a,R=d,Q?P.insertBefore(d,Q):P.appendChild(d),R=null}function p(a,b,c){function d(){a.onload=a.onerror=a.onreadystatechange=null,u.debug||P.removeChild(a),a=null,b()}var e="onload"in a;e?(a.onload=d,a.onerror=function(){B("error",{uri:c,node:a}),d()}):a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&d()}}function q(){if(R)return R;if(S&&"interactive"===S.readyState)return S;for(var a=P.getElementsByTagName("script"),b=a.length-1;b>=0;b--){var c=a[b];if("interactive"===c.readyState)return S=c}}function r(a){var b=[];return a.replace(U,"").replace(T,function(a,c,d){d&&b.push(d)}),b}function s(a,b){this.uri=a,this.dependencies=b||[],this.exports=null,this.status=0,this._waitings={},this._remain=0}if(!a.seajs){var t=a.seajs={version:"2.3.0"},u=t.data={},v=c("Object"),w=c("String"),x=Array.isArray||c("Array"),y=c("Function"),z=0,A=u.events={};t.on=function(a,b){var c=A[a]||(A[a]=[]);return c.push(b),t},t.off=function(a,b){if(!a&&!b)return A=u.events={},t;var c=A[a];if(c)if(b)for(var d=c.length-1;d>=0;d--)c[d]===b&&c.splice(d,1);else delete A[a];return t};var B=t.emit=function(a,b){var c=A[a],d;if(c){c=c.slice();for(var e=0,f=c.length;f>e;e++)c[e](b)}return t},C=/[^?#]*\//,D=/\/\.\//g,E=/\/[^/]+\/\.\.\//,F=/([^:/])\/+\//g,G=/^([^/:]+)(\/.+)$/,H=/{([^{]+)}/g,I=/^\/\/.|:\//,J=/^.*?\/\/.*?\//,K=document,L=location.href&&0!==location.href.indexOf("about:")?e(location.href):"",M=K.scripts,N=K.getElementById("seajsnode")||M[M.length-1],O=e(n(N)||L);t.resolve=m;var P=K.head||K.getElementsByTagName("head")[0]||K.documentElement,Q=P.getElementsByTagName("base")[0],R,S;t.request=o;var T=/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\/\*[\S\s]*?\*\/|\/(?:\\\/|[^\/\r\n])+\/(?=[^\/])|\/\/.*|\.\s*require|(?:^|[^$])\brequire\s*\(\s*(["'])(.+?)\1\s*\)/g,U=/\\\\/g,V=t.cache={},W,X={},Y={},Z={},$=s.STATUS={FETCHING:1,SAVED:2,LOADING:3,LOADED:4,EXECUTING:5,EXECUTED:6};s.prototype.resolve=function(){for(var a=this,b=a.dependencies,c=[],d=0,e=b.length;e>d;d++)c[d]=s.resolve(b[d],a.uri);return c},s.prototype.load=function(){var a=this;if(!(a.status>=$.LOADING)){a.status=$.LOADING;var c=a.resolve();B("load",c);for(var d=a._remain=c.length,e,f=0;d>f;f++)e=s.get(c[f]),e.status<$.LOADED?e._waitings[a.uri]=(e._waitings[a.uri]||0)+1:a._remain--;if(0===a._remain)return a.onload(),b;var g={};for(f=0;d>f;f++)e=V[c[f]],e.status<$.FETCHING?e.fetch(g):e.status===$.SAVED&&e.load();for(var h in g)g.hasOwnProperty(h)&&g[h]()}},s.prototype.onload=function(){var a=this;a.status=$.LOADED,a.callback&&a.callback();var b=a._waitings,c,d;for(c in b)b.hasOwnProperty(c)&&(d=V[c],d._remain-=b[c],0===d._remain&&d.onload());delete a._waitings,delete a._remain},s.prototype.fetch=function(a){function c(){t.request(g.requestUri,g.onRequest,g.charset)}function d(){delete X[h],Y[h]=!0,W&&(s.save(f,W),W=null);var a,b=Z[h];for(delete Z[h];a=b.shift();)a.load()}var e=this,f=e.uri;e.status=$.FETCHING;var g={uri:f};B("fetch",g);var h=g.requestUri||f;return!h||Y[h]?(e.load(),b):X[h]?(Z[h].push(e),b):(X[h]=!0,Z[h]=[e],B("request",g={uri:f,requestUri:h,onRequest:d,charset:u.charset}),g.requested||(a?a[g.requestUri]=c:c()),b)},s.prototype.exec=function(){function a(b){return s.get(a.resolve(b)).exec()}var c=this;if(c.status>=$.EXECUTING)return c.exports;c.status=$.EXECUTING;var e=c.uri;a.resolve=function(a){return s.resolve(a,e)},a.async=function(b,c){return s.use(b,c,e+"_async_"+d()),a};var f=c.factory,g=y(f)?f(a,c.exports={},c):f;return g===b&&(g=c.exports),delete c.factory,c.exports=g,c.status=$.EXECUTED,B("exec",c),g},s.resolve=function(a,b){var c={id:a,refUri:b};return B("resolve",c),c.uri||t.resolve(c.id,b)},s.define=function(a,c,d){var e=arguments.length;1===e?(d=a,a=b):2===e&&(d=c,x(a)?(c=a,a=b):c=b),!x(c)&&y(d)&&(c=r(""+d));var f={id:a,uri:s.resolve(a),deps:c,factory:d};if(!f.uri&&K.attachEvent){var g=q();g&&(f.uri=g.src)}B("define",f),f.uri?s.save(f.uri,f):W=f},s.save=function(a,b){var c=s.get(a);c.status<$.SAVED&&(c.id=b.id||a,c.dependencies=b.deps||[],c.factory=b.factory,c.status=$.SAVED,B("save",c))},s.get=function(a,b){return V[a]||(V[a]=new s(a,b))},s.use=function(b,c,d){var e=s.get(d,x(b)?b:[b]);e.callback=function(){for(var b=[],d=e.resolve(),f=0,g=d.length;g>f;f++)b[f]=V[d[f]].exec();c&&c.apply(a,b),delete e.callback},e.load()},t.use=function(a,b){return s.use(a,b,u.cwd+"_use_"+d()),t},s.define.cmd={},a.define=s.define,t.Module=s,u.fetchedList=Y,u.cid=d,t.require=function(a){var b=s.get(s.resolve(a));return b.status<$.EXECUTING&&(b.onload(),b.exec()),b.exports},u.base=O,u.dir=O,u.cwd=L,u.charset="utf-8",t.config=function(a){for(var b in a){var c=a[b],d=u[b];if(d&&v(d))for(var e in c)d[e]=c[e];else x(d)?c=d.concat(c):"base"===b&&("/"!==c.slice(-1)&&(c+="/"),c=l(c)),u[b]=c}return B("config",a),t}}}(this); diff --git a/example/boundarybox.html b/example/boundarybox.html index b5eda49..2e619e9 100644 --- a/example/boundarybox.html +++ b/example/boundarybox.html @@ -5,9 +5,9 @@ - + diff --git a/example/clip.html b/example/clip.html index 5eea17f..60aebe4 100644 --- a/example/clip.html +++ b/example/clip.html @@ -6,9 +6,9 @@ - + diff --git a/example/coordinate.html b/example/coordinate.html index 493089a..1739d75 100644 --- a/example/coordinate.html +++ b/example/coordinate.html @@ -6,9 +6,9 @@ - + diff --git a/example/curve.html b/example/curve.html index 95de2c2..bf10c5c 100644 --- a/example/curve.html +++ b/example/curve.html @@ -5,9 +5,9 @@ - + diff --git a/example/filter/convolve/blur.html b/example/filter/convolve/blur.html index 46a7063..24484f4 100644 --- a/example/filter/convolve/blur.html +++ b/example/filter/convolve/blur.html @@ -13,9 +13,9 @@ - + diff --git a/example/filter/convolve/edge-detection.html b/example/filter/convolve/edge-detection.html index 0cac0f2..9de0855 100644 --- a/example/filter/convolve/edge-detection.html +++ b/example/filter/convolve/edge-detection.html @@ -13,9 +13,9 @@ - + diff --git a/example/filter/convolve/relief.html b/example/filter/convolve/relief.html index e9b4bc9..31d20fb 100644 --- a/example/filter/convolve/relief.html +++ b/example/filter/convolve/relief.html @@ -13,9 +13,9 @@ - + diff --git a/example/filter/convolve/sharpen.html b/example/filter/convolve/sharpen.html index a562634..7115cf3 100644 --- a/example/filter/convolve/sharpen.html +++ b/example/filter/convolve/sharpen.html @@ -13,9 +13,9 @@ - + diff --git a/example/filter/gaussianblur.html b/example/filter/gaussianblur.html index b322a48..a93ca53 100644 --- a/example/filter/gaussianblur.html +++ b/example/filter/gaussianblur.html @@ -7,9 +7,9 @@ - + diff --git a/example/filter/projection.html b/example/filter/projection.html index e1e8744..eb87823 100644 --- a/example/filter/projection.html +++ b/example/filter/projection.html @@ -7,9 +7,9 @@ - + diff --git a/example/group.html b/example/group.html index 40fc382..3dddd19 100644 --- a/example/group.html +++ b/example/group.html @@ -5,9 +5,9 @@ - + diff --git a/example/lineargradientbrush.html b/example/lineargradientbrush.html index d487f60..ba0acd8 100644 --- a/example/lineargradientbrush.html +++ b/example/lineargradientbrush.html @@ -5,9 +5,9 @@ - + diff --git a/example/mask.html b/example/mask.html index ff62223..e0dac04 100644 --- a/example/mask.html +++ b/example/mask.html @@ -6,9 +6,9 @@ - + diff --git a/example/patternbrush.html b/example/patternbrush.html index 83cc1a4..e44469c 100644 --- a/example/patternbrush.html +++ b/example/patternbrush.html @@ -5,9 +5,9 @@ - + diff --git a/example/pen.html b/example/pen.html index 852f2ad..677d846 100644 --- a/example/pen.html +++ b/example/pen.html @@ -5,9 +5,9 @@ - + diff --git a/example/radialgradientbrush.html b/example/radialgradientbrush.html index dd9406e..8d9dc75 100644 --- a/example/radialgradientbrush.html +++ b/example/radialgradientbrush.html @@ -5,9 +5,9 @@ - + diff --git a/example/renderbox.html b/example/renderbox.html index 37dec62..c16f279 100644 --- a/example/renderbox.html +++ b/example/renderbox.html @@ -5,9 +5,9 @@ - + diff --git a/example/text.html b/example/text.html index ae1d6ae..489bb1a 100644 --- a/example/text.html +++ b/example/text.html @@ -6,9 +6,9 @@ - + diff --git a/example/textalign.html b/example/textalign.html index 687b582..20066ae 100644 --- a/example/textalign.html +++ b/example/textalign.html @@ -6,9 +6,9 @@ - + diff --git a/example/transform.html b/example/transform.html index fbcd4f4..a01a9c0 100644 --- a/example/transform.html +++ b/example/transform.html @@ -6,9 +6,9 @@ - + diff --git a/example/use.html b/example/use.html index ffac865..4144f0d 100644 --- a/example/use.html +++ b/example/use.html @@ -7,9 +7,9 @@ - + diff --git a/example/viewbox.html b/example/viewbox.html index c9453f4..20c78a3 100644 --- a/example/viewbox.html +++ b/example/viewbox.html @@ -6,9 +6,9 @@ - + diff --git a/spec/exports.js b/spec/exports.js index 856fd0a..7c9f04f 100644 --- a/spec/exports.js +++ b/spec/exports.js @@ -1,3 +1,3 @@ /*global use:true*/ -inc.use('kity'); \ No newline at end of file +seajs.use('kity'); \ No newline at end of file diff --git a/spec/karmaConfig.js b/spec/karmaConfig.js index 09de5a0..ddf8973 100644 --- a/spec/karmaConfig.js +++ b/spec/karmaConfig.js @@ -5,6 +5,6 @@ * Time: 下午7:24 * To change this template use File | Settings | File Templates. */ -inc.config({ +seajs.config({ base: 'base/src' }); \ No newline at end of file diff --git a/spec/tools/caseSource.php b/spec/tools/caseSource.php index 4a55ad2..589302d 100644 --- a/spec/tools/caseSource.php +++ b/spec/tools/caseSource.php @@ -38,8 +38,8 @@ public function print_js( $cov) else{ $basePath = '../../src'; } - print "\n"; - print "\n"; + print "\n";