Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Fixing Travis, grunt tests. Fixed demo page for angular 1.2. #42

Merged
merged 2 commits into from
Oct 10, 2013
Merged

Fixing Travis, grunt tests. Fixed demo page for angular 1.2. #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60973b
Fixing Travis, grunt tests and demo page (because of module updates).
thgreasi Oct 10, 2013
1230f0e
Fixed demo page for angular 1.2
thgreasi Oct 10, 2013
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
4 changes: 2 additions & 2 deletions demo/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="components/jquery-ui/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" href="demo/demo.css">
<script type="text/javascript" src="bower_components/jquery/jquery.js"></script>
<script type="text/javascript" src="bower_components/jquery-ui/ui/jquery-ui.custom.js"></script>
<script type="text/javascript" src="bower_components/jquery-ui/ui/jquery-ui.js"></script>
<script type="text/javascript" src="bower_components/angular/angular.js"></script>
<script type="text/javascript" src="src/sortable.js"></script>
<script type="text/javascript">
Expand Down Expand Up @@ -51,7 +51,7 @@ <h2>ui.sortable demo</h2>
</ul>

<ul class="list logList">
<li ng-repeat="entry in sortingLog" class="logItem">{{entry}}</li>
<li ng-repeat="entry in sortingLog track by $index" class="logItem">{{entry}}</li>
</ul>
</div>
</body>
Expand Down
0 test/sortableSpec.js → test/sortable.spec.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/test.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files = [
JASMINE,
JASMINE_ADAPTER,
'bower_components/jquery/jquery.js',
'bower_components/jquery-ui/ui/jquery-ui.custom.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'src/sortable.js',
Expand Down