Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
2
2015-12-uni-ffm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CmS
2015-12-uni-ffm
Commits
a22d00ab
Commit
a22d00ab
authored
11 years ago
by
Hakim El Hattab
Browse files
Options
Downloads
Patches
Plain Diff
server side notes plugin now supports input via data-notes attribute
parent
9478d03c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugin/notes-server/client.js
+28
-17
28 additions, 17 deletions
plugin/notes-server/client.js
plugin/notes/notes.js
+15
-6
15 additions, 6 deletions
plugin/notes/notes.js
with
43 additions
and
23 deletions
plugin/notes-server/client.js
+
28
−
17
View file @
a22d00ab
(
function
()
{
// don't emit events from inside the previews themselves
if
(
window
.
location
.
search
.
match
(
/receiver/gi
)
)
{
return
;
}
if
(
window
.
location
.
search
.
match
(
/receiver/gi
)
)
{
return
;
}
var
socket
=
io
.
connect
(
window
.
location
.
origin
);
var
socketId
=
Math
.
random
().
toString
().
slice
(
2
);
console
.
log
(
'
View slide notes at
'
+
window
.
location
.
origin
+
'
/notes/
'
+
socketId
);
window
.
open
(
window
.
location
.
origin
+
'
/notes/
'
+
socketId
,
'
notes-
'
+
socketId
);
var
socket
=
io
.
connect
(
window
.
location
.
origin
);
var
socketId
=
Math
.
random
().
toString
().
slice
(
2
);
console
.
log
(
'
View slide notes at
'
+
window
.
location
.
origin
+
'
/notes/
'
+
socketId
);
window
.
open
(
window
.
location
.
origin
+
'
/notes/
'
+
socketId
,
'
notes-
'
+
socketId
);
// Fires when a fragment is shown
Reveal
.
addEventListener
(
'
fragmentshown
'
,
function
(
event
)
{
...
...
@@ -23,16 +24,17 @@
fragment
:
'
previous
'
,
socketId
:
socketId
};
socket
.
emit
(
'
fragmentchanged
'
,
fragmentData
);
socket
.
emit
(
'
fragmentchanged
'
,
fragmentData
);
}
);
// Fires when slide is changed
Reveal
.
addEventListener
(
'
slidechanged
'
,
function
(
event
)
{
var
nextindexh
;
var
nextindexv
;
var
slideElement
=
event
.
currentSlide
;
var
nextindexh
,
nextindexv
,
slideElement
=
event
.
currentSlide
,
notesElement
=
slideElement
.
querySelector
(
'
aside.notes
'
);
if
(
slideElement
.
nextElementSibling
&&
slideElement
.
parentNode
.
nodeName
==
'
SECTION
'
)
{
if
(
slideElement
.
nextElementSibling
&&
slideElement
.
parentNode
.
nodeName
==
'
SECTION
'
)
{
nextindexh
=
event
.
indexh
;
nextindexv
=
event
.
indexv
+
1
;
}
else
{
...
...
@@ -40,18 +42,27 @@
nextindexv
=
0
;
}
var
notes
=
slideElement
.
querySelector
(
'
aside.notes
'
);
var
slideData
=
{
notes
:
notes
?
notes
.
innerHTML
:
''
,
var
messageData
=
{
notes
:
''
,
indexh
:
event
.
indexh
,
indexv
:
event
.
indexv
,
nextindexh
:
nextindexh
,
nextindexv
:
nextindexv
,
socketId
:
socketId
,
markdown
:
notes
?
typeof
notes
.
getAttribute
(
'
data-markdown
'
)
===
'
string
'
:
false
markdown
:
false
};
socket
.
emit
(
'
slidechanged
'
,
slideData
);
// Look for notes defined in a slide attribute
if
(
slideElement
.
hasAttribute
(
'
data-notes
'
)
)
{
messageData
.
notes
=
slideElement
.
getAttribute
(
'
data-notes
'
);
}
// Look for notes defined in an aside element
if
(
notesElement
)
{
messageData
.
notes
=
notesElement
.
innerHTML
;
messageData
.
markdown
=
typeof
notesElement
.
getAttribute
(
'
data-markdown
'
)
===
'
string
'
;
}
socket
.
emit
(
'
slidechanged
'
,
messageData
);
}
);
}());
This diff is collapsed.
Click to expand it.
plugin/notes/notes.js
+
15
−
6
View file @
a22d00ab
...
...
@@ -24,9 +24,7 @@ var RevealNotes = (function() {
function
post
()
{
var
slideElement
=
Reveal
.
getCurrentSlide
(),
slideIndices
=
Reveal
.
getIndices
(),
messageData
;
var
notes
=
slideElement
.
querySelector
(
'
aside.notes
'
),
notesElement
=
slideElement
.
querySelector
(
'
aside.notes
'
),
nextindexh
,
nextindexv
;
...
...
@@ -38,16 +36,27 @@ var RevealNotes = (function() {
nextindexv
=
0
;
}
messageData
=
{
notes
:
notes
?
notes
.
innerHTML
:
''
,
var
messageData
=
{
notes
:
''
,
indexh
:
slideIndices
.
h
,
indexv
:
slideIndices
.
v
,
indexf
:
slideIndices
.
f
,
nextindexh
:
nextindexh
,
nextindexv
:
nextindexv
,
markdown
:
notes
?
typeof
notes
.
getAttribute
(
'
data-markdown
'
)
===
'
string
'
:
false
markdown
:
false
};
// Look for notes defined in a slide attribute
if
(
slideElement
.
hasAttribute
(
'
data-notes
'
)
)
{
messageData
.
notes
=
slideElement
.
getAttribute
(
'
data-notes
'
);
}
// Look for notes defined in an aside element
if
(
notesElement
)
{
messageData
.
notes
=
notesElement
.
innerHTML
;
messageData
.
markdown
=
typeof
notesElement
.
getAttribute
(
'
data-markdown
'
)
===
'
string
'
;
}
notesPopup
.
postMessage
(
JSON
.
stringify
(
messageData
),
'
*
'
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment