チェンジセット 1517

コミット日時:

2008/10/05 05:34:33 (3 年前)

コミッタ:

gyuque

ログメッセージ:

0.4.4: mousedown handler, _width/_height

ファイル:

• ruby/jsplash/trunk/client2/index.xml (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/executor.js (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (6 diffs)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (3 diffs)
• ruby/jsplash/trunk/client2/rocket_demo (追加)
• ruby/jsplash/trunk/client2/rocket_demo.xml (追加)
• ruby/jsplash/trunk/client2/rocket_demo/asblock.js (追加)
• ruby/jsplash/trunk/client2/rocket_demo/movie1.js (追加)
• ruby/jsplash/trunk/client2/rocket_demo/original (追加)
• ruby/jsplash/trunk/client2/rocket_demo/original/rocket.swf (追加)
• ruby/jsplash/trunk/client2/rocket_demo_fl.html (追加)

ruby/jsplash/trunk/client2/index.xml

@@ -54 +54 @@
-                <div id="progbar"><div>  </div></div>
-                <p id="statusout"> </p>
-3
+4
-                <svg id="svgrt" xmlns="http://www.w3.org/2000/svg" style="width: 100px; height: 100px;">
-                </svg>

ruby/jsplash/trunk/client2/jsplash/executor.js

@@ -114 +114 @@
-                                mobj.doEnterFrame();
-                }
-
+
+
-//////////////////////////////////// debug
-                {

ruby/jsplash/trunk/client2/jsplash/objects.js

@@ -39 +39 @@
-                this.appended = false;
-                this.shape_disposed = false;
+
+                this.mousePos = {x:0, y:0};
-
-                this.framePersists = {};
@@ -339 +341 @@
-                if (!skip_visual_change)        
-                        this.hideClippers();
+
+                if (this.g && this.g.childNodes.length > 0)
+                        this.updateProxy();
-        },
-        
@@ -399 +404 @@
-
-        doEnterFrame: function() {
+                if (!this.klass)
+                        return;
+                var vlist = this.klass.getVarList();
+
-                var handler = this.getProxy().onEnterFrame;
- && this.klass
+
-                
-                        if (!handler._ai_)
-                                handler._ai_ = new JSplash.ActionInstance(handler);
-                        
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        },
@@ -551 +571 @@
-                P._yscale = T.sy * 100.0;
-                P._rotation = T.r;
+
+                P._xmouse = this.mousePos.x;
+                P._ymouse = this.mousePos.y;
+
+                this.putViewSize(P);
+        },
+
+        putViewSize: function(P) {
+                if (JSplash._bbox_implemented) {
+                        try {
+                                var b = this.g.getBBox();
+                                P._width  = b.width;
+                                P._height = b.height;
+                        } catch(e) {
+                                console.warn("This browser does not support SVG bounding box completely.");
+                                JSplash._bbox_implemented = false;
+                        }
+                }
-        },
-        
@@ -588 +626 @@
-        var s = new JSplash.ObjectInstance(taglist, null, g);
-        s.label_map = label_map;
+        s.mouse_down = false;
-        
-        Object.extend(s, {
-                registry: {},
+
+                leaveFrame: function() {
+                        this.mouse_down = false;
+                },
+
+                setMouseDown: function() {
+                        this.mouse_down = true;
+                },
+
+                setMousePos: function(x, y) {
+                        this.mousePos.x = x;
+                        this.mousePos.y = y;
+                        var P = this.getProxy();
+                        P._xmouse = x;
+                        P._ymouse = y;
+                },
-        
-                setBackgroundColor: function(rgb) {
@@ -678 +733 @@
-                if (!this.onEnterFrame)
-                        this.onEnterFrame = null;
+                if (!this.onMouseDown)
+                        this.onMouseDown = null;
-        },
-        

ruby/jsplash/trunk/client2/jsplash/player.js

@@ -1 @@
-
+, _bbox_implemented: true
-if (!window.console)
-        window.console = {log:function(){}, warn:function(){}};
@@ -28 +28 @@
-                }
-                
+                svg.addEventListener("mousemove", this.onTopMouseMove.bind(this, svg), false);
+                svg.addEventListener("mousedown", this.onTopMouseDown.bind(this), false);
+
-                JSplash.SWFGlobals.setup(this);
-                this.doInitActions();
@@ -44 +47 @@
-                
-                delete Object.prototype.addProperty;
+        },
+
+        onTopMouseDown: function(e) {
+                if (Event.isLeftClick(e))
+                        this.stage.setMouseDown();
+        },
+
+        onTopMouseMove: function(svg, e) {
+                var x, y;
+                if (e.offsetX) {
+                        x = e.offsetX;
+                        y = e.offsetY;
+                }
+                else {
+                        x = e.layerX;
+                        y = e.layerY;
+                }
+
+                this.stage.setMousePos(x, y);
-        },
-