Skip to content

Commit 3b84989

Browse files
committed
Show modals again, function method changed apparently
1 parent 3713971 commit 3b84989

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

CHANGELOG.rdoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Please add each new change as its own line to the top of the list below when a p
66

77
Most recent changes:
88

9+
11/06 Fixed modals not showing up after The Great JS CDN Migration
910
11/06 Content in dropdowns now gets properly scoped to a universe scope
1011
11/06 Fixed a handful of style bugs around the site from the new design
1112
11/06 Styled markdown fields so markdown lists are visible

app/assets/javascripts/content.js.coffee

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ $(document).ready ->
44
btn_href = $('.card-action a').attr('href').split('#')[0];
55
tab_anchor = $(this).find('a').attr('href')
66
$('.card-action a').attr('href', btn_href + tab_anchor);
7+
78
if location.hash?
89
setTimeout ( ->
910
window.scrollTo(0, 0);
1011
), 1
1112

13+
$('.modal').modal();
14+
1215
$('.new-attribute-field-link').click (e) ->
1316
e.preventDefault()
14-
$("#attribute-field-modal").openModal()
17+
$("#attribute-field-modal").modal('open')
1518

1619
$('.share').click ->
17-
$('#share-modal').openModal()
20+
$('#share-modal').modal('open')

app/assets/javascripts/keyboardControlDefault.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
22
* Mapping of the keyboard controls to functions.
3-
*
3+
*
44
* If you'd like to add any new keyboard controls, this is the place to do it.'
55
*/
66

77
var KEYCODES = {
88
"?" : 191,
9-
"n" : 78,
10-
"c" : 67,
11-
"u" : 85,
12-
"i" : 73,
13-
"l" : 76
9+
"n" : 78,
10+
"c" : 67,
11+
"u" : 85,
12+
"i" : 73,
13+
"l" : 76
1414
};
1515

1616
var default_keyboard_controls = [
@@ -20,7 +20,7 @@ var default_keyboard_controls = [
2020
{ key : KEYCODES["?"], shiftKey : true, ctrlKey : false }
2121
],
2222
"result" : function () {
23-
$("#keyboard-controls-help-modal").openModal()
23+
$("#keyboard-controls-help-modal").modal('open');
2424
}
2525
},
2626

app/views/content/form/_actions_dropdown.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<ul id='options-menu' class='dropdown-content'>
66
<li>
7-
<%= link_to "Create new attribute", '#attr-modal', class: 'black-text new-attribute-field-link' %>
7+
<%= link_to "Create new attribute", '#attribute-field-modal', class: 'black-text new-attribute-field-link' %>
88
</li>
99

1010
<% if content.persisted? %>

0 commit comments

Comments
 (0)