Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f83263d5
Commit
f83263d5
authored
Sep 06, 2012
by
Tom Giannattasio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed blank slate sidebar resize glitch
parent
9160a997
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
7 deletions
+46
-7
lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+45
-6
lms/templates/discussion/index.html
+1
-1
No files found.
lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
View file @
f83263d5
...
@@ -15,6 +15,7 @@ class @DiscussionThreadListView extends Backbone.View
...
@@ -15,6 +15,7 @@ class @DiscussionThreadListView extends Backbone.View
@
collection
.
on
"add"
,
@
addAndSelectThread
@
collection
.
on
"add"
,
@
addAndSelectThread
@
sidebar_padding
=
10
@
sidebar_padding
=
10
@
sidebar_header_height
=
87
@
sidebar_header_height
=
87
@
boardName
reloadDisplayedCollection
:
(
thread
)
=>
reloadDisplayedCollection
:
(
thread
)
=>
thread_id
=
thread
.
get
(
'id'
)
thread_id
=
thread
.
get
(
'id'
)
...
@@ -41,8 +42,8 @@ class @DiscussionThreadListView extends Backbone.View
...
@@ -41,8 +42,8 @@ class @DiscussionThreadListView extends Backbone.View
windowHeight
=
$
(
window
).
height
();
windowHeight
=
$
(
window
).
height
();
discussionBody
=
$
(
".discussion-article"
)
discussionBody
=
$
(
".discussion-article"
)
discussionsBodyTop
=
if
discussionBody
[
0
]
then
discussionBody
.
offset
().
top
;
discussionsBodyTop
=
if
discussionBody
[
0
]
then
discussionBody
.
offset
().
top
discussionsBodyBottom
=
discussionsBodyTop
+
discussionBody
.
outerHeight
()
;
discussionsBodyBottom
=
discussionsBodyTop
+
discussionBody
.
outerHeight
()
sidebar
=
$
(
".sidebar"
)
sidebar
=
$
(
".sidebar"
)
if
scrollTop
>
discussionsBodyTop
-
@
sidebar_padding
if
scrollTop
>
discussionsBodyTop
-
@
sidebar_padding
...
@@ -62,10 +63,11 @@ class @DiscussionThreadListView extends Backbone.View
...
@@ -62,10 +63,11 @@ class @DiscussionThreadListView extends Backbone.View
amount
=
Math
.
max
(
topOffset
-
discussionBottomOffset
,
0
)
amount
=
Math
.
max
(
topOffset
-
discussionBottomOffset
,
0
)
sidebarHeight
=
sidebarHeight
-
@
sidebar_padding
-
amount
sidebarHeight
=
sidebarHeight
-
@
sidebar_padding
-
amount
sidebar
.
css
'height'
,
Math
.
min
(
Math
.
max
(
sidebarHeight
,
400
),
discussionBody
.
outerHeight
())
sidebarHeight
=
Math
.
min
(
Math
.
max
(
sidebarHeight
,
400
),
discussionBody
.
outerHeight
())
sidebar
.
css
'height'
,
sidebarHeight
postListWrapper
=
@
$
(
'.post-list-wrapper'
)
postListWrapper
=
@
$
(
'.post-list-wrapper'
)
postListWrapper
.
css
(
'height'
,
(
sidebarHeight
-
@
sidebar_header_height
-
4
)
+
'px'
)
;
postListWrapper
.
css
(
'height'
,
(
sidebarHeight
-
@
sidebar_header_height
-
4
)
+
'px'
)
# Because we want the behavior that when the body is clicked the menu is
# Because we want the behavior that when the body is clicked the menu is
...
@@ -150,16 +152,53 @@ class @DiscussionThreadListView extends Backbone.View
...
@@ -150,16 +152,53 @@ class @DiscussionThreadListView extends Backbone.View
boardName
=
item
.
find
(
".board-name"
).
html
()
boardName
=
item
.
find
(
".board-name"
).
html
()
_
.
each
item
.
parents
(
'ul'
).
not
(
'.browse-topic-drop-menu'
),
(
parent
)
->
_
.
each
item
.
parents
(
'ul'
).
not
(
'.browse-topic-drop-menu'
),
(
parent
)
->
boardName
=
$
(
parent
).
siblings
(
'a'
).
find
(
'.board-name'
).
html
()
+
' / '
+
boardName
boardName
=
$
(
parent
).
siblings
(
'a'
).
find
(
'.board-name'
).
html
()
+
' / '
+
boardName
@
$
(
".current-board"
).
html
(
boardName
)
@
$
(
".current-board"
).
html
(
@
fitName
(
boardName
)
)
fontSize
=
16
fontSize
=
16
@
$
(
".current-board"
).
css
(
'font-size'
,
'16px'
)
@
$
(
".current-board"
).
css
(
'font-size'
,
'16px'
)
while
@
$
(
".current-board"
).
width
()
>
(
@
$el
.
width
()
*
.
8
)
-
40
while
@
$
(
".current-board"
).
width
()
>
(
@
$el
.
width
()
*
.
8
)
-
40
fontSize
--
fontSize
--
if
fontSize
<
11
if
fontSize
<
11
break
break
@
$
(
".current-board"
).
css
(
'font-size'
,
fontSize
+
'px'
)
@
$
(
".current-board"
).
css
(
'font-size'
,
fontSize
+
'px'
)
setSelectedTopic
:
(
name
)
->
@
$
(
".current-board"
).
html
(
@
fitName
(
name
))
getNameWidth
:
(
name
)
->
test
=
$
(
"<div>"
)
test
.
css
"font-size"
:
@
$
(
".current-board"
).
css
(
'font-size'
)
opacity
:
0
position
:
'absolute'
left
:
-
1000
top
:
-
1000
$
(
"body"
).
append
(
test
)
test
.
html
(
name
)
width
=
test
.
width
()
test
.
remove
()
return
width
fitName
:
(
name
)
->
width
=
@
getNameWidth
(
name
)
if
width
<
@
maxNameWidth
return
name
path
=
(
x
.
replace
/^\s+|\s+$/g
,
""
for
x
in
name
.
split
(
"/"
))
while
path
.
length
>
1
path
.
shift
()
partialName
=
"... / "
+
path
.
join
(
" / "
)
if
@
getNameWidth
(
partialName
)
<
@
maxNameWidth
return
partialName
rawName
=
path
[
0
]
name
=
"... / "
+
rawName
while
@
getNameWidth
(
name
)
>
@
maxNameWidth
rawName
=
rawName
[
0
...
rawName
.
length
-
1
]
name
=
"... / "
+
rawName
+
" ..."
return
name
filterTopic
:
(
event
)
->
filterTopic
:
(
event
)
->
@
setTopic
(
event
)
@
setTopic
(
event
)
item
=
$
(
event
.
target
).
closest
(
'li'
)
item
=
$
(
event
.
target
).
closest
(
'li'
)
...
...
lms/templates/discussion/index.html
View file @
f83263d5
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<div
class=
"discussion-body"
>
<div
class=
"discussion-body"
>
<div
class=
"sidebar"
></div>
<div
class=
"sidebar"
></div>
<div
class=
"discussion-column"
>
<div
class=
"discussion-column"
>
<div
class=
"blank-slate"
>
<div
class=
"
discussion-article
blank-slate"
>
<h1>
${course.title} discussions
</h1>
<h1>
${course.title} discussions
</h1>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment