[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Refactoring extension name

2017-01-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332216 )

Change subject: Refactoring extension name
..


Refactoring extension name

Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761
---
M BlueSpiceSubPageTree.class.php
D bluespice.subpagetree.js
M extension.json
A resources/bluespice.subpagetree.js
4 files changed, 41 insertions(+), 26 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php
index 197ebdf..ea6e284 100644
--- a/BlueSpiceSubPageTree.class.php
+++ b/BlueSpiceSubPageTree.class.php
@@ -1,4 +1,5 @@
 getOutput()->addModules("ext.bluespice.subpagetree");
 
-   $treeRoot = "";
+   $sTreeRoot = "";
if( !empty( $args["root"] ) ){
-   $treeRoot = $args["root"];
-   }else{
-   global $bsgPageTreeRoot;
-   $treeRoot = $bsgPageTreeRoot;
+   $sTreeRoot = $args["root"];
}
-   if( strpos( $treeRoot, ":" ) === false ){
-   $treeRoot = ":" . $treeRoot;
+   else {
+   global $bsgSubPageTreeRoot;
+   $sTreeRoot = $bsgSubPageTreeRoot;
}
 
-   return "";
+   if( strpos( $sTreeRoot, ":" ) === false ){
+   $sTreeRoot = ":" . $sTreeRoot;
+   }
+
+   return Html::element(
+   'div',
+   array(
+   'class' => 'bs-subpagetree',
+   'data-root' => $sTreeRoot
+   ),
+   ''
+   );
}
-
 }
diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js
deleted file mode 100644
index 8b8ac0b..000
--- a/bluespice.subpagetree.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var treeNodes = Ext.query('.pagetree');
-
-treeNodes.forEach(function(node){
-   Ext.create('BS.tree.WikiSubPages', {
-   renderTo: node,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
-   treeRootPath: node.getAttribute("root"),
-   listeners: {
-   itemclick: function( obj, record, item, index, e, eOpts 
){
-   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
-   }
-   }
-   });
-});
diff --git a/extension.json b/extension.json
index df8c706..9bf1bda 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;,
"author": "Leonid Verhovskij",
-   "descriptionmsg": "bs-pagetreee-desc",
+   "descriptionmsg": "bs-subagetreee-desc",
"type": "bluespice",
"AutoloadClasses": {
"BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php"
@@ -19,8 +19,8 @@
}
},
"ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "BlueSpiceSubPageTree"
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceSubPageTree/resources"
},
"bsgExtensions": {
"BlueSpiceSubPageTree": {
diff --git a/resources/bluespice.subpagetree.js 
b/resources/bluespice.subpagetree.js
new file mode 100644
index 000..c231f64
--- /dev/null
+++ b/resources/bluespice.subpagetree.js
@@ -0,0 +1,11 @@
+$( '.bs-subpagetree' ).each( function() {
+   Ext.create('BS.tree.WikiSubPages', {
+   renderTo: this,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
+   treeRootPath: $(this).data( 'root' ),
+   listeners: {
+   itemclick: function( obj, record, item, index, e, eOpts 
){
+   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
+   }
+   }
+   });
+});
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Refactoring extension name

2017-01-16 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332216 )

Change subject: Refactoring extension name
..

Refactoring extension name

Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761
---
M BlueSpiceSubPageTree.class.php
D bluespice.subpagetree.js
M extension.json
A resources/bluespice.subpagetree.js
4 files changed, 41 insertions(+), 26 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree 
refs/changes/16/332216/1

diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php
index 197ebdf..ea6e284 100644
--- a/BlueSpiceSubPageTree.class.php
+++ b/BlueSpiceSubPageTree.class.php
@@ -1,4 +1,5 @@
 getOutput()->addModules("ext.bluespice.subpagetree");
 
-   $treeRoot = "";
+   $sTreeRoot = "";
if( !empty( $args["root"] ) ){
-   $treeRoot = $args["root"];
-   }else{
-   global $bsgPageTreeRoot;
-   $treeRoot = $bsgPageTreeRoot;
+   $sTreeRoot = $args["root"];
}
-   if( strpos( $treeRoot, ":" ) === false ){
-   $treeRoot = ":" . $treeRoot;
+   else {
+   global $bsgSubPageTreeRoot;
+   $sTreeRoot = $bsgSubPageTreeRoot;
}
 
-   return "";
+   if( strpos( $sTreeRoot, ":" ) === false ){
+   $sTreeRoot = ":" . $sTreeRoot;
+   }
+
+   return Html::element(
+   'div',
+   array(
+   'class' => 'bs-subpagetree',
+   'data-root' => $sTreeRoot
+   ),
+   ''
+   );
}
-
 }
diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js
deleted file mode 100644
index 8b8ac0b..000
--- a/bluespice.subpagetree.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var treeNodes = Ext.query('.pagetree');
-
-treeNodes.forEach(function(node){
-   Ext.create('BS.tree.WikiSubPages', {
-   renderTo: node,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
-   treeRootPath: node.getAttribute("root"),
-   listeners: {
-   itemclick: function( obj, record, item, index, e, eOpts 
){
-   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
-   }
-   }
-   });
-});
diff --git a/extension.json b/extension.json
index df8c706..9bf1bda 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;,
"author": "Leonid Verhovskij",
-   "descriptionmsg": "bs-pagetreee-desc",
+   "descriptionmsg": "bs-subagetreee-desc",
"type": "bluespice",
"AutoloadClasses": {
"BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php"
@@ -19,8 +19,8 @@
}
},
"ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "BlueSpiceSubPageTree"
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceSubPageTree/resources"
},
"bsgExtensions": {
"BlueSpiceSubPageTree": {
diff --git a/resources/bluespice.subpagetree.js 
b/resources/bluespice.subpagetree.js
new file mode 100644
index 000..c231f64
--- /dev/null
+++ b/resources/bluespice.subpagetree.js
@@ -0,0 +1,11 @@
+$( '.bs-subpagetree' ).each( function() {
+   Ext.create('BS.tree.WikiSubPages', {
+   renderTo: this,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
+   treeRootPath: $(this).data( 'root' ),
+   listeners: {
+   itemclick: function( obj, record, item, index, e, eOpts 
){
+   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
+   }
+   }
+   });
+});
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Refactoring extension name

2017-01-16 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332215 )

Change subject: Refactoring extension name
..

Refactoring extension name

commit 58413486b4b1bafc08a9f14337f93f1c18a5be79
Author: rvogel 
Date:   Wed Jan 11 10:17:26 2017 +0100

Refactoring extension name

Change-Id: I8b582966eee3f975068b95f35d07f28573de1b54

Change-Id: I55a572ae6c2bf7bfc17cc78b963cdfb4a1745afb
---
M BlueSpiceSubPageTree.class.php
D bluespice.subpagetree.js
M extension.json
A resources/bluespice.subpagetree.js
4 files changed, 41 insertions(+), 26 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree 
refs/changes/15/332215/1

diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php
index 197ebdf..ea6e284 100644
--- a/BlueSpiceSubPageTree.class.php
+++ b/BlueSpiceSubPageTree.class.php
@@ -1,4 +1,5 @@
 getOutput()->addModules("ext.bluespice.subpagetree");
 
-   $treeRoot = "";
+   $sTreeRoot = "";
if( !empty( $args["root"] ) ){
-   $treeRoot = $args["root"];
-   }else{
-   global $bsgPageTreeRoot;
-   $treeRoot = $bsgPageTreeRoot;
+   $sTreeRoot = $args["root"];
}
-   if( strpos( $treeRoot, ":" ) === false ){
-   $treeRoot = ":" . $treeRoot;
+   else {
+   global $bsgSubPageTreeRoot;
+   $sTreeRoot = $bsgSubPageTreeRoot;
}
 
-   return "";
+   if( strpos( $sTreeRoot, ":" ) === false ){
+   $sTreeRoot = ":" . $sTreeRoot;
+   }
+
+   return Html::element(
+   'div',
+   array(
+   'class' => 'bs-subpagetree',
+   'data-root' => $sTreeRoot
+   ),
+   ''
+   );
}
-
 }
diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js
deleted file mode 100644
index 8b8ac0b..000
--- a/bluespice.subpagetree.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var treeNodes = Ext.query('.pagetree');
-
-treeNodes.forEach(function(node){
-   Ext.create('BS.tree.WikiSubPages', {
-   renderTo: node,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
-   treeRootPath: node.getAttribute("root"),
-   listeners: {
-   itemclick: function( obj, record, item, index, e, eOpts 
){
-   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
-   }
-   }
-   });
-});
diff --git a/extension.json b/extension.json
index df8c706..9bf1bda 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;,
"author": "Leonid Verhovskij",
-   "descriptionmsg": "bs-pagetreee-desc",
+   "descriptionmsg": "bs-subagetreee-desc",
"type": "bluespice",
"AutoloadClasses": {
"BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php"
@@ -19,8 +19,8 @@
}
},
"ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "BlueSpiceSubPageTree"
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceSubPageTree/resources"
},
"bsgExtensions": {
"BlueSpiceSubPageTree": {
diff --git a/resources/bluespice.subpagetree.js 
b/resources/bluespice.subpagetree.js
new file mode 100644
index 000..c231f64
--- /dev/null
+++ b/resources/bluespice.subpagetree.js
@@ -0,0 +1,11 @@
+$( '.bs-subpagetree' ).each( function() {
+   Ext.create('BS.tree.WikiSubPages', {
+   renderTo: this,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
+   treeRootPath: $(this).data( 'root' ),
+   listeners: {
+   itemclick: function( obj, record, item, index, e, eOpts 
){
+   window.location.href = mw.util.wikiGetlink( 
record.internalId ) ;
+   }
+   }
+   });
+});
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55a572ae6c2bf7bfc17cc78b963cdfb4a1745afb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Refactoring extension name

2017-01-11 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331589 )

Change subject: Refactoring extension name
..

Refactoring extension name

Change-Id: I8b582966eee3f975068b95f35d07f28573de1b54
---
R BlueSpiceSubPageTree.class.php
M extension.json
R resources/bluespice.subpagetree.js
3 files changed, 16 insertions(+), 16 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree 
refs/changes/89/331589/1

diff --git a/BlueSpicePageTree.class.php b/BlueSpiceSubPageTree.class.php
similarity index 81%
rename from BlueSpicePageTree.class.php
rename to BlueSpiceSubPageTree.class.php
index d4356fe..ab3a958 100644
--- a/BlueSpicePageTree.class.php
+++ b/BlueSpiceSubPageTree.class.php
@@ -1,9 +1,9 @@
  tag, it executes 
BlueSpicePageTree::renderPageTree
-   $parser->setHook( 'pagetree', 
'BlueSpicePageTree::renderPageTree' );
+   // When the parser sees the  tag, it executes 
BlueSpiceSubPageTree::renderPageTree
+   $parser->setHook( 'pagetree', 
'BlueSpiceSubPageTree::renderPageTree' );
 
return true;
}
@@ -26,4 +26,4 @@
return "";
}
 
-}
\ No newline at end of file
+}
diff --git a/extension.json b/extension.json
index 91e8914..f0cb330 100644
--- a/extension.json
+++ b/extension.json
@@ -1,17 +1,17 @@
 {
-   "name": "BlueSpicePageTree",
+   "name": "BlueSpiceSubPageTree",
"version": "2.27.1-alpha",
-   "url": "https://help.bluespice.com/index.php/BlueSpicePageTree;,
+   "url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;,
"author": "Leonid Verhovskij",
"descriptionmsg": "bs-pagetreee-desc",
"type": "bluespice",
"AutoloadClasses": {
-   "BlueSpicePageTree": "BlueSpicePageTree.class.php"
+   "BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php"
},
"ResourceModules": {
"ext.bluespice.pagetree": {
"scripts": [
-   "bluespice.pagetree.js"
+   "bluespice.subpagetree.js"
],
"dependencies":[
"ext.bluespice.extjs"
@@ -19,17 +19,17 @@
}
},
"ResourceFileModulePaths": {
-   "localBasePath": "",
-   "remoteExtPath": "BlueSpicePageTree"
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceSubPageTree/resources"
},
"bsgExtensions": {
-   "BlueSpicePageTree": {
-   "className": "BlueSpicePageTree",
-   "extPath": "/BlueSpicePageTree"
+   "BlueSpiceSubPageTree": {
+   "className": "BlueSpiceSubPageTree",
+   "extPath": "/BlueSpiceSubPageTree"
}
},
"Hooks": {
-   "ParserFirstCallInit": "BlueSpicePageTree::onParserSetup"
+   "ParserFirstCallInit": "BlueSpiceSubPageTree::onParserSetup"
},
 
"config": {
diff --git a/bluespice.pagetree.js b/resources/bluespice.subpagetree.js
similarity index 75%
rename from bluespice.pagetree.js
rename to resources/bluespice.subpagetree.js
index 5b52e99..8b8ac0b 100644
--- a/bluespice.pagetree.js
+++ b/resources/bluespice.subpagetree.js
@@ -2,7 +2,7 @@
 
 treeNodes.forEach(function(node){
Ext.create('BS.tree.WikiSubPages', {
-   renderTo: node,//this div is created by 
BlueSpicePageTree::renderPageTree (ParserFirstCallInit)
+   renderTo: node,//this div is created by 
BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit)
treeRootPath: node.getAttribute("root"),
listeners: {
itemclick: function( obj, record, item, index, e, eOpts 
){
@@ -10,4 +10,4 @@
}
}
});
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b582966eee3f975068b95f35d07f28573de1b54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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