jenkins-bot has submitted this change and it was merged.
Change subject: Fix trigger demo
......................................................................
Fix trigger demo
Objective:
* Make trigger demo work
Changes:
demos/trigger/index.html
* Include new dependencies: oojs, unicodejs
* Update use of ve.Trigger, which is now ve.ui.Trigger
Change-Id: I973375821625629b3dfc3f30f07fc8ec699d24ce
---
M demos/trigger/index.html
1 file changed, 14 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/trigger/index.html b/demos/trigger/index.html
index ad4cab6..b9b6ce5 100644
--- a/demos/trigger/index.html
+++ b/demos/trigger/index.html
@@ -99,8 +99,16 @@
</tr>
</table>
<script src="../../modules/jquery/jquery.js"></script>
+ <script src="../../modules/oojs/oo.js"></script>
+ <script src="../../modules/unicodejs/unicodejs.js"></script>
+ <script
src="../../modules/unicodejs/unicodejs.graphemebreak.js"></script>
+ <script
src="../../modules/unicodejs/unicodejs.graphemebreakproperties.js"></script>
+ <script
src="../../modules/unicodejs/unicodejs.textstring.js"></script>
+ <script
src="../../modules/unicodejs/unicodejs.wordbreak.js"></script>
+ <script
src="../../modules/unicodejs/unicodejs.wordbreakproperties.js"></script>
<script src="../../modules/ve/ve.js"></script>
- <script src="../../modules/ve/ve.Trigger.js"></script>
+ <script src="../../modules/ve/ui/ve.ui.js"></script>
+ <script src="../../modules/ve/ui/ve.ui.Trigger.js"></script>
<script>
function setTrigger( trigger ) {
var i, len, key,
@@ -119,9 +127,9 @@
$primary = $( '#primary' ),
$modifiers = $( '#modifiers' ),
$aliases = $( '#aliases' ),
- primaryKeys = ve.Trigger.static.primaryKeys,
- modifierKeys = ve.Trigger.static.modifierKeys,
- keyAliases = ve.Trigger.static.keyAliases;
+ primaryKeys = ve.ui.Trigger.static.primaryKeys,
+ modifierKeys =
ve.ui.Trigger.static.modifierKeys,
+ keyAliases = ve.ui.Trigger.static.keyAliases;
for ( i = 0, len = modifierKeys.length; i < len; i++ ) {
$modifiers.append(
@@ -155,7 +163,7 @@
$( 'body' ).on( {
'keydown': function ( e ) {
$( '.active' ).removeClass( 'active' );
- setTrigger( new ve.Trigger( e ) );
+ setTrigger( new ve.ui.Trigger( e ) );
e.preventDefault();
}
} );
@@ -182,7 +190,7 @@
$( '.active' ).each( function
() {
parts.push(
$(this).attr( 'rel' ) );
} );
- setTrigger( new ve.Trigger(
parts.join( '+' ) ) );
+ setTrigger( new ve.ui.Trigger(
parts.join( '+' ) ) );
}
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/76658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I973375821625629b3dfc3f30f07fc8ec699d24ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
