Skip to content

No jquery #1

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

Closed
wants to merge 17 commits into from
Closed

No jquery #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cd81f2f
CUI
martinrode Sep 1, 2016
5e83ddf
CUI
martinrode Sep 2, 2016
9e7c554
DOM
martinrode Sep 5, 2016
f9d5271
Merge branch 'master' into no-jquery
martinrode Sep 5, 2016
acae206
Theme.ng
martinrode Sep 5, 2016
b1e69ce
Merge branch 'master' into no-jquery
martinrode Sep 5, 2016
24cd3dd
- Renamed last occurences of ez-tmpl to cui-tmpl and removed some unu…
martinrode Sep 5, 2016
ce49725
- two forgotten renames from ez-tmpl to cui-tmpl
martinrode Sep 5, 2016
d3ef1bd
CUI
martinrode Sep 5, 2016
6c7c8aa
CUI
martinrode Sep 5, 2016
4dc73d6
DOM
martinrode Sep 5, 2016
9e0afb0
Merge branch 'master' into no-jquery
martinrode Sep 6, 2016
eb6611e
Demo
martinrode Sep 6, 2016
046f1d9
Merge branch 'master' into no-jquery
martinrode Sep 7, 2016
64673a8
Playground: add persistent tooltip to buttons
mrflix Sep 9, 2016
6f7fcd8
Tab: turn buttons into button-group
mrflix Sep 9, 2016
bef707d
first new ng-design steps
mrflix Sep 9, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ easydbui_js = $(target)/easydbui.js

coffee_files = src/base/Common.coffee \
src/base/CUI.coffee \
src/base/jQuery.fn.coffee \
src/base/jQueryCompat.coffee \
src/base/Deferred/Deferred.coffee \
src/base/Deferred/Promise.coffee \
src/base/Deferred/when.coffee \
Expand Down Expand Up @@ -130,8 +130,9 @@ test_files = src/tests/Test.coffee.js \
src/tests/Test_MoveInArray.coffee.js \
src/tests/Test_Promise.coffee.js

thirdparty_files = thirdparty/*/jquery-2.1.0.js \
thirdparty/moment/*js \
# thirdparty/*/jquery-2.1.0.js \

thirdparty_files = thirdparty/moment/*js \
thirdparty/moment/*json \
thirdparty/marked/lib/marked.js

Expand All @@ -155,7 +156,6 @@ html_files = \
src/elements/Block/Block.html \
src/elements/WaitBlock/WaitBlock.html \
src/elements/ItemList/ItemList.html \
src/elements/Modal/Modal.html \
src/elements/Panel/Panel.html \
src/elements/Pane/Pane.html \
src/elements/StickyHeader/StickyHeader.html \
Expand Down
1 change: 1 addition & 0 deletions demo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ coffee_files = src/demo.coffee \
src/CUIDemo.coffee \
src/ControlsDemo.coffee \
src/MemoryTester.coffee \
src/Playground.coffee \
src/BoundingBoxDemo/BoundingBoxDemo.coffee \
../src/base/DragDropSelect/demo/DragDropSelectDemo.coffee \
../src/base/Events/demo/EventsDemo.coffee \
Expand Down
5 changes: 3 additions & 2 deletions demo/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>easydbui - demo</title>
<script src="../jquery-2.1.0.js" type="text/javascript" charset="utf-8"></script>
<script src="../moment-with-locales.js" type="text/javascript" charset="utf-8"></script>
<script src="../moment-timezone-with-data.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="../moment-timezone-with-data.min.js" type="text/javascript" charset="utf-8"></script> -->
<script src="../easydbui.js" type="text/javascript" charset="utf-8"></script>
<script src="../marked.js" type="text/javascript" charset="utf-8"></script>
<script src="easydbui_demo.js" type="text/javascript" charset="utf-8"></script>
</head>
<body class="cui-body">
<!--
<div class="cui-tmpl cui-tmpl-demo-root">
<div class="cui-demo-root-body">
</div>
</div>
<div class="cui-tmpl cui-tmpl-memory-tester">
<span class="txt"></span>
</div>
-->
</body>
</html>
8 changes: 4 additions & 4 deletions demo/src/MemoryTester.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class MemoryTester extends Demo


testLayer: (i, tooltip = @__tooltip) ->
l = new Layer
l = new CUI.Layer
element: $(document.body)
placement: "c"

Expand Down Expand Up @@ -164,13 +164,13 @@ class MemoryTester extends Demo

runSimpleTemplate: (txt) ->

class MemTest extends DOM
class MemTest extends CUI.DOM
readOpts: ->
super()
d = $div()
# DOM.setElement(d, @, false)
@registerDOMElement(d)



Demo.register(new MemoryTester())
# this needs fixing, so disable it for now
# Demo.register(new MemoryTester())
Loading