From 603248a9c58270de0c68100b2828c6566bda2394 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 10 Dec 2014 18:11:53 -0800 Subject: [PATCH] Update VE core submodule to master (26f44bc) New changes: 26f44bc Refactor out trigger listening to allow target and document triggers Local change to register the file for TriggerListener from VE core, Change-Id: I16316b71d67b872358a8d7b685a33ce3dc066614 --- .docs/categories.json | 1 + .docs/eg-iframe.html | 1 + VisualEditor.php | 1 + lib/ve | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.docs/categories.json b/.docs/categories.json index fe41763a75..c709149991 100644 --- a/.docs/categories.json +++ b/.docs/categories.json @@ -38,6 +38,7 @@ "ve.Range", "ve.EventSequencer", "ve.Filibuster", + "ve.TriggerListener", "ve.Node", "ve.BranchNode", "ve.LeafNode", diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html index 4c9b4de460..19b27c3e60 100644 --- a/.docs/eg-iframe.html +++ b/.docs/eg-iframe.html @@ -107,6 +107,7 @@ + diff --git a/VisualEditor.php b/VisualEditor.php index 48d0656305..732a2c9fb4 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -275,6 +275,7 @@ $wgResourceModules += array( 'scripts' => array( // ve 'lib/ve/src/ve.utils.js', + 'lib/ve/src/ve.TriggerListener.js', // init 'lib/ve/src/init/ve.init.js', diff --git a/lib/ve b/lib/ve index 3feadb2657..26f44bc486 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 3feadb265740c564fb2d209d7da20ff27396fd5d +Subproject commit 26f44bc486c293d7cabd10a5020bc0d195d0285e