1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
diff --git a/ep.json b/ep.json
index 083d484..6803475 100644
--- a/ep.json
+++ b/ep.json
@@ -5,6 +5,7 @@
"hooks": {
"eejsBlock_editbarMenuLeft": "ep_embedmedia/hooks:eejsBlock_editbarMenuLeft",
"eejsBlock_scripts": "ep_embedmedia/hooks:eejsBlock_scripts",
+ "eejsBlock_timesliderBody": "ep_embedmedia/hooks:eejsBlock_scripts",
"eejsBlock_styles": "ep_embedmedia/hooks:eejsBlock_styles",
"eejsBlock_body": "ep_embedmedia/hooks:eejsBlock_body"
},
diff --git a/static/css/main.css b/static/css/main.css
index 72a460f..3b66d8e 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -6,10 +6,18 @@
z-index:999999;
}
+#embedMediaSrc {
+ max-width: 100%;
+}
+
.embedMediaButton {
padding:10px;
}
+#doEmbedMedia{
+ color:blue;
+}
+
#cancelEmbedMedia{
color:red;
}
@@ -19,6 +27,6 @@
}
.buttonicon-embed-media:before{
- content:"\e80b";
+ content:"\e83b";
top: 2px !important;
}
diff --git a/static/js/main.js b/static/js/main.js
index 8c94767..19415d5 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -10,22 +10,25 @@ $(document).ready(function () {
} else {
module.slideDown("fast");
}
+ module.toggleClass("popup-show");
});
$("#doEmbedMedia").click(function () {
var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor;
$("#embedMediaModal").slideUp("fast");
+ $("#embedMediaModal").removeClass("popup-show");
return padeditor.ace.callWithAce(function (ace) {
- rep = ace.ace_getRep();
+ var rep = ace.ace_getRep();
ace.ace_replaceRange(rep.selStart, rep.selEnd, "E");
ace.ace_performSelectionChange([rep.selStart[0],rep.selStart[1]-1], rep.selStart, false);
- ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]);
+ ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]);
}, "embedMedia");
});
$("#cancelEmbedMedia").click(function () {
$("#embedMediaModal").slideUp("fast");
+ $("#embedMediaModal").removeClass("popup-show");
});
});
diff --git a/templates/modals.ejs b/templates/modals.ejs
index 9340698..8915a3b 100644
--- a/templates/modals.ejs
+++ b/templates/modals.ejs
@@ -1,4 +1,4 @@
-<div id="embedMediaModal" class="popup">
+<div id="embedMediaModal" class="popup popup-content">
<% e.begin_block("embedMediaPopup"); %>
<h1>Embed media into this pad</h1>
<p>Paste a link or "embed code" here:</p>
|
