[MediaWiki-commits] [Gerrit] Security and styling fix - change (mediawiki...Graph)

2014-10-03 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/164708

Change subject: Security and styling fix
..

Security and styling fix

* Per https://bugzilla.wikimedia.org/show_bug.cgi?id=69623#c7
  vg.config.safeMode is true unless vg.config.domainWhiteList is false
* mw-wiki-graph css: display: inline-block

Change-Id: I8d880ef762e00506e0e1fb570bedd1be3d64dbac
---
M js/graph.js
M styles/common.less
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph 
refs/changes/08/164708/1

diff --git a/js/graph.js b/js/graph.js
index 2a00ea8..4bf7f5c 100644
--- a/js/graph.js
+++ b/js/graph.js
@@ -1,9 +1,7 @@
 ( function( $ ) {
$( function() {
vg.config.domainWhiteList = mw.config.get('wgGraphDataDomains');
-   if (vg.config.domainWhiteList) {
-   vg.config.safeMode = true;
-   }
+   vg.config.safeMode = vg.config.domainWhiteList !== false;
$('.mw-wiki-graph').each(function () {
var definition = $(this).data('spec'),
el = this;
diff --git a/styles/common.less b/styles/common.less
index e69de29..5f32fa3 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -0,0 +1,3 @@
+.mw-wiki-graph {
+   display: inline-block
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/164708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d880ef762e00506e0e1fb570bedd1be3d64dbac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Security and styling fix - change (mediawiki...Graph)

2014-10-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Security and styling fix
..


Security and styling fix

* Per https://bugzilla.wikimedia.org/show_bug.cgi?id=69623#c7
  vg.config.safeMode is true unless vg.config.domainWhiteList is false
* mw-wiki-graph css: display: inline-block

Change-Id: I8d880ef762e00506e0e1fb570bedd1be3d64dbac
---
M js/graph.js
M styles/common.less
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  CSteipp: Looks good to me, but someone else must approve
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/graph.js b/js/graph.js
index 2a00ea8..4bf7f5c 100644
--- a/js/graph.js
+++ b/js/graph.js
@@ -1,9 +1,7 @@
 ( function( $ ) {
$( function() {
vg.config.domainWhiteList = mw.config.get('wgGraphDataDomains');
-   if (vg.config.domainWhiteList) {
-   vg.config.safeMode = true;
-   }
+   vg.config.safeMode = vg.config.domainWhiteList !== false;
$('.mw-wiki-graph').each(function () {
var definition = $(this).data('spec'),
el = this;
diff --git a/styles/common.less b/styles/common.less
index e69de29..5f32fa3 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -0,0 +1,3 @@
+.mw-wiki-graph {
+   display: inline-block
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/164708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d880ef762e00506e0e1fb570bedd1be3d64dbac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits