Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added draggables #2

Merged
merged 3 commits into from
Jul 16, 2012
Merged

added draggables #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
733cd93
draggable added
klimacampimrheinland Jul 5, 2012
fb5ee33
readme update
klimacampimrheinland Jul 5, 2012
039ce64
update für opa 0.9.4
klimacampimrheinland Jul 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ OTHER_DEPENDS =

#Compiler variables
OPACOMPILER = opa
MINIMAL_VERSION = 1150
MINIMAL_VERSION = 0
FLAG = --minimal-version $(MINIMAL_VERSION) -v
PORT = 8080

Expand Down
1 change: 1 addition & 0 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This is a project binding [jQuery UI](http://jqueryui.com) and porting its demos
For now the only working functionality is:

* Sortables (default demo)
* Draggables

Want to help?

Expand Down
24 changes: 22 additions & 2 deletions jquery-ui-demo.opa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,27 @@ import jQueryUI

//type demo_page = { string name, ( -> xhtml) show }
//type demo = { string name, list(demo_page) pages }
module Draggable {
demo =
{ name: "Draggable"
, pages:
[ {name: "drag" , show: on_update_demo }
]
}



client function on_update_demo(){
function mk_draggable(_) {
jQueryUI.Draggable.mk_draggable(#draggable)
//return js_void;
}

<div id=draggable style="background:#cccccc" onready={mk_draggable}>bla</div>

}

}
module Sortable {

demo =
Expand Down Expand Up @@ -52,7 +72,7 @@ module Sortable {

}

demos = [Sortable.demo]
demos = [Sortable.demo, Draggable.demo]

function mk_demo(demo) {
function show_demo(gen)(_event) {
Expand Down Expand Up @@ -86,7 +106,7 @@ function page() {

Server.start(Server.http,
[ {resources: @static_resource_directory("resources")}
, {register: ["resources/bootstrap.css", "resources/style.css", "resources/bootstrap.js"]}
, {register:{css: ["resources/bootstrap.css", "resources/style.css", "resources/bootstrap.js"]}}
, {title: "JQuery-UI in Opa", ~page}
]
)
6 changes: 6 additions & 0 deletions packages/jQueryUI/jQueryUI.opa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,11 @@ module jQueryUI {
}

}
module Draggable {
function void mk_draggable(dom) {
elt = Dom.of_selection(dom)
%%JQueryUI.mk_draggable%%(elt)

}
}
}
2 changes: 1 addition & 1 deletion packages/jQueryUI/jQueryUI/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# USER VARIABLES
MKLIB = opa-plugin-builder
PLUGNAME = jQueryUI.opp
SRC = jQueryUI.js ui/jquery.ui.widget.js ui/jquery.ui.core.js ui/jquery.ui.mouse.js ui/jquery.ui.sortable.js
SRC = jQueryUI.js ui/jquery.ui.widget.js ui/jquery.ui.core.js ui/jquery.ui.mouse.js ui/jquery.ui.sortable.js ui/jquery.ui.draggable.js
#ui/jquery-ui.js

########################################
Expand Down
6 changes: 6 additions & 0 deletions packages/jQueryUI/jQueryUI/jQueryUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@
return dom.bind( "sortupdate", function(event, ui) { on_update(); } );
}

##register mk_draggable: Dom.private.element -> void
##args(dom)
{
dom.draggable();
return js_void;
}