]> source.dussan.org Git - jquery-ui.git/commitdiff
Position: Simplify default demo by removing drag functionality on positioned elements...
authorScott González <scott.gonzalez@gmail.com>
Sun, 15 Apr 2012 18:40:12 +0000 (14:40 -0400)
committerScott González <scott.gonzalez@gmail.com>
Sun, 15 Apr 2012 18:42:09 +0000 (14:42 -0400)
(cherry picked from commit 6da7278e879c0dc734c23231a71fdd92f7a57a0c)

Conflicts:

demos/position/default.html

demos/position/default.html

index 4c33f7e8fca15ea6a539eedd1a7ffc6317bf46ba..54c9331a2110bb1ca73bee85a2e6a601a0a8a6d8 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 <head>
        <meta charset="utf-8">
        </style>
        <script>
        $(function() {
-               function position( using ) {
+               function position() {
                        $( ".positionable" ).position({
                                of: $( "#parent" ),
                                my: $( "#my_horizontal" ).val() + " " + $( "#my_vertical" ).val(),
                                at: $( "#at_horizontal" ).val() + " " + $( "#at_vertical" ).val(),
                                offset: $( "#offset" ).val(),
-                               using: using,
-                               collision: $( "#collision_horizontal" ).val() + ' ' + $( "#collision_vertical" ).val()
+                               collision: $( "#collision_horizontal" ).val() + " " + $( "#collision_vertical" ).val()
                        });
                }
 
                $( ".positionable" ).css( "opacity", 0.5 );
 
-               $( ":input" ).bind( "click keyup change", function() { position(); });
+               $( ":input" ).bind( "click keyup change", position );
 
                $( "#parent" ).draggable({
-                       drag: function() { position(); }
-               });
-
-               $( ".positionable" ).draggable({
-                       drag: function( event, ui ) {
-                               // reset offset before calculating it
-                               $( "#offset" ).val( "0" );
-                               position(function( result ) {
-                                       $( "#offset" ).val( "" + ( ui.offset.left - result.left ) +
-                                               " " + ( ui.offset.top - result.top ) );
-                                       position();
-                               });
-                       }
+                       drag: position
                });
 
                position();
                        <option value="left">left</option>
                        <option value="center">center</option>
                        <option value="right">right</option>
-               </select> 
+               </select>
                <select id="my_vertical">
                        <option value="top">top</option>
                        <option value="middle">center</option>
        </div>
        <div style="padding-bottom: 20px;">
                <b>offset:</b>
-               <input id="offset" type="text" size="15"/>
+               <input id="offset">
        </div>
        <div style="padding-bottom: 20px;">
                <b>collision:</b>