scratch – Diff between revs 31 and 32

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 31 Rev 32
Line 10... Line 10...
10 <link rel="icon" href="favicon.ico"> 10 <link rel="icon" href="favicon.ico">
Line 11... Line 11...
11   11  
Line 12... Line 12...
12 <title>Quickload</title> 12 <title>Quickload</title>
13 13
Line 14... Line 14...
14 <!-- Polyfill --> 14 <!-- Polyfill -->
15 <!-- <script src="js/polyfill/polyfill.min.js"></script> --> 15 <script src="js/polyfill/polyfill.min.js"></script>
Line 16... Line 16...
16   16  
Line 31... Line 31...
31 <![endif]--> 31 <![endif]-->
Line 32... Line 32...
32 32
33 <!-- Trumbowyg --> 33 <!-- Trumbowyg -->
34 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet"> 34 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet">
35 <!-- Local style --> 35 <!-- Local style -->
36 <!-- <link href="css/style.css" rel="stylesheet"> --> 36 <link href="css/text/style.css" rel="stylesheet">
Line 37... Line 37...
37 </head> 37 </head>
Line 38... Line 38...
38   38  
Line 59... Line 59...
59 <span class="input-group-btn"> 59 <span class="input-group-btn">
60 <button id="save" class="btn btn-default" type="button"> 60 <button id="save" class="btn btn-default" type="button">
61 <i class="glyphicon glyphicon-globe"></i> 61 <i class="glyphicon glyphicon-globe"></i>
62 </button> 62 </button>
63 </span> 63 </span>
-   64 <span class="input-group-btn">
-   65 <button id="clippy" class="btn btn-default" type="button" data-clipboard-target="#URL"><img class="clippy" src="img/clipboard/clippy.svg" width="13" alt="Copy to Clipboard"></button>
-   66 </span>
64 </div> 67 </div>
65 </div> 68 </div>
66 <div class="panel-body" id="uploadpanel"> 69 <div class="panel-body" id="editorpanel">
67 <div id="trumbowyg" style="height: 334px; display: none; font-family: monospace;"> 70 <div id="trumbowyg" style="display: none; font-family: monospace;">
68 </div> 71 </div>
69 </div> 72 </div>
70 </div> 73 </div>
Line 71... Line 74...
71   74  
Line 82... Line 85...
82 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> 85 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
83 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script> 86 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script>
Line 84... Line 87...
84 87
85 <!-- Trumbowyg --> 88 <!-- Trumbowyg -->
-   89 <script src="js/trumbowyg/trumbowyg.min.js"></script>
-   90 <!-- Clipboard -->
86 <script src="js/trumbowyg/trumbowyg.min.js"></script> 91 <script src="js/clipboard/clipboard.min.js"></script>
87 <script> 92 <script>
88 $(document).ready(() => { 93 $(document).ready(() => {
89 // Load the editor. 94 // Load the editor.
90 $('#trumbowyg').trumbowyg({ 95 $('#trumbowyg').trumbowyg({
Line 110... Line 115...
110 }).fail(() => { 115 }).fail(() => {
111 $('#trumbowyg').trumbowyg('enable'); 116 $('#trumbowyg').trumbowyg('enable');
112 $('#trumbowyg').show(); 117 $('#trumbowyg').show();
113 }); 118 });
Line -... Line 119...
-   119
-   120 // Enable the Clipboard button.
-   121 new Clipboard('#clippy');
114 122
115 $('#save').click(() => { 123 $('#save').click(() => {
Line 116... Line 124...
116 $('#editor').trumbowyg('disable'); 124 $('#editor').trumbowyg('disable');
117 125
Line 137... Line 145...
137 }).fail(() => { 145 }).fail(() => {
138 alert('failed'); 146 alert('failed');
139 $('#trumbowyg').trumbowyg('enable'); 147 $('#trumbowyg').trumbowyg('enable');
140 }); 148 });
141 }); 149 });
-   150
142 }); 151 });
143 </script> 152 </script>
144 </body> 153 </body>
145 </html> 154 </html>