Skip to content

Commit b777762

Browse files
authored
Merge pull request #1 from dannon/selten_dev
Build client/formatting.
2 parents a3c00c1 + 4dc97ce commit b777762

5 files changed

Lines changed: 18 additions & 12 deletions

File tree

client/galaxy/scripts/mvc/tours.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ Select any tour to get started (and remember, you can click 'End Tour' at any ti
136136

137137
var tourtags = {};
138138
_.each(this.model.models, function(tour) {
139-
if(tour.attributes.tags === null) {
140-
if(tourtags[""] === undefined) {
141-
tourtags[""] = {"name": "Untagged", "tours": []};
139+
if (tour.attributes.tags === null) {
140+
if (tourtags[""] === undefined) {
141+
tourtags[""] = { name: "Untagged", tours: [] };
142142
}
143143
tourtags[""]["tours"].push(tour);
144144
} else {
145-
_.each(tour.attributes.tags, function (tag) {
145+
_.each(tour.attributes.tags, function(tag) {
146146
if (tourtags[tag] === undefined) {
147-
tourtags[tag] = {"name": tag, "tours": []};
147+
tourtags[tag] = { name: tag, tours: [] };
148148
}
149149
tourtags[tag]["tours"].push(tour);
150150
});
@@ -153,7 +153,13 @@ Select any tour to get started (and remember, you can click 'End Tour' at any ti
153153
var tourtagorder = Object.keys(tourtags).sort();
154154

155155
this.$el
156-
.html(tpl({ tours: this.model.models, tourtags: tourtags, tourtagorder: tourtagorder}))
156+
.html(
157+
tpl({
158+
tours: this.model.models,
159+
tourtags: tourtags,
160+
tourtagorder: tourtagorder
161+
})
162+
)
157163
.on("click", ".tourItem", function(e) {
158164
e.preventDefault();
159165
giveTour($(this).data("tour.id"));
@@ -166,10 +172,10 @@ Select any tour to get started (and remember, you can click 'End Tour' at any ti
166172
elem.toggleClass("btn-primary");
167173
elem.toggleClass("btn-secondary");
168174

169-
if(elem.hasClass("btn-secondary")) {
175+
if (elem.hasClass("btn-secondary")) {
170176
display = "none";
171177
}
172-
$("div[tag='"+tag+"']").css({display: display});
178+
$("div[tag='" + tag + "']").css({ display: display });
173179
});
174180
}
175181
});

static/maps/mvc/tours.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/scripts/bundled/libs.bundled.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/scripts/bundled/libs.bundled.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)