Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[49658] branches/experimental/wikiLingo
|
From: <rob...@us...> - 2014-01-31 12:45:10
|
Revision: 49658
http://sourceforge.net/p/tikiwiki/code/49658
Author: robertplummer
Date: 2014-01-31 12:45:06 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
[ENH] wikiLingo can now parse in wiki!
Modified Paths:
--------------
branches/experimental/wikiLingo/composer.json
branches/experimental/wikiLingo/composer.lock
branches/experimental/wikiLingo/lib/setup/events.php
Removed Paths:
-------------
branches/experimental/wikiLingo/12.x/
Modified: branches/experimental/wikiLingo/composer.json
===================================================================
--- branches/experimental/wikiLingo/composer.json 2014-01-31 11:35:55 UTC (rev 49657)
+++ branches/experimental/wikiLingo/composer.json 2014-01-31 12:45:06 UTC (rev 49658)
@@ -62,7 +62,7 @@
"smarty/smarty": "3.1.14",
"svg-edit/svg-edit": "2.6",
"symfony/console": "2.2.0",
- "wikiLingo":"1.0",
+ "wikilingo/wikilingo":"0.11",
"zetacomponents/base": "1.8",
"zetacomponents/webdav": "1.1.3"
},
@@ -84,6 +84,7 @@
"Math": "lib/core/",
"Category": "lib/core/",
"WikiParser": "lib/core/",
+ "WikiPlugin": "lib/core/",
"Multilingual": "lib/core/",
"Tracker": "lib/core/",
"Event": "lib/core/",
@@ -95,10 +96,7 @@
"Report": "lib/core/",
"Feed": "lib/core/",
"FutureLink": "lib/core/",
- "FileGallery": "lib/core/",
- "WikiPlugin": "vendor/wikiLingo/WikiLingo",
- "WikiLingoWYSISYG": "vendor/wikiLingo/WikiLingoWYSISYG",
- "WYSISYGWikiLingo": "vendor/wikiLingo/WYSISYGWikiLingo"
+ "FileGallery": "lib/core/"
},
"classmap": [
"vendor_extra/pear/",
Modified: branches/experimental/wikiLingo/composer.lock
===================================================================
--- branches/experimental/wikiLingo/composer.lock 2014-01-31 11:35:55 UTC (rev 49657)
+++ branches/experimental/wikiLingo/composer.lock 2014-01-31 12:45:06 UTC (rev 49658)
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "b4d5fa2b530c15c663e7d41a953698a1",
+ "hash": "bfcdba10d10f428c58f4a5d5f974b4f8",
"packages": [
{
"name": "aFarkas/html5shiv",
@@ -230,13 +230,13 @@
"source": {
"type": "svn",
"url": "http://svn.code.sf.net/p/jcapture-applet/code",
- "reference": "/trunk/@46"
+ "reference": "/trunk/@47"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/jcapture-applet-jcapture-applet-dev-trunk-f04408.zip",
+ "url": "https://composer.tiki.org/dist/jcapture-applet-jcapture-applet-dev-trunk-56537c.zip",
"reference": "dev-trunk",
- "shasum": "99359f87c4472e26605dc4989fd7624506ed6701"
+ "shasum": "0f910540cf75ece6edf67ba09af420f9b6d01f04"
},
"type": "library",
"license": [
@@ -264,7 +264,7 @@
"screencapture",
"screenshot"
],
- "time": "2013-04-18 04:48:36"
+ "time": "2014-01-27 14:02:15"
},
{
"name": "jquery/jquery",
@@ -918,26 +918,44 @@
"time": "2013-03-01 06:43:14"
},
{
- "name": "wikiLingo",
- "version": "1.0",
+ "name": "twitter/bootstrap",
+ "version": "3.0.3",
"dist": {
"type": "zip",
- "url": "https://github.com/wikiLingo/wikiLingo/archive/master.zip",
+ "url": "https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
- "name": "twitter/bootstrap",
- "version": "3.0.3",
+ "name": "wikilingo/wikilingo",
+ "version": "0.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wikiLingo/wikiLingo.git",
+ "reference": "84762b95a911f732f668829f1cc28aa3290464c5"
+ },
"dist": {
"type": "zip",
- "url": "https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip",
- "reference": null,
- "shasum": null
+ "url": "https://api.github.com/repos/wikiLingo/wikiLingo/zipball/84762b95a911f732f668829f1cc28aa3290464c5",
+ "reference": "84762b95a911f732f668829f1cc28aa3290464c5",
+ "shasum": ""
},
- "type": "library"
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Types\\": "./",
+ "WikiLingo\\": "./",
+ "WikiLingoWYSIWYG\\": "./",
+ "WYSIWYGWikiLingo\\": "./"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "time": "2014-01-31 12:23:42"
},
{
"name": "zetacomponents/base",
Modified: branches/experimental/wikiLingo/lib/setup/events.php
===================================================================
--- branches/experimental/wikiLingo/lib/setup/events.php 2014-01-31 11:35:55 UTC (rev 49657)
+++ branches/experimental/wikiLingo/lib/setup/events.php 2014-01-31 12:45:06 UTC (rev 49658)
@@ -159,12 +159,13 @@
$events->bind('tiki.wiki.save', 'tiki.save');
$events->bind('tiki.wiki.parse', function($args) use ($prefs){
- if($prefs['feature_wikilingo']){
+ if($prefs['feature_wikilingo'] === 'y'){
$wikiLingo = new WikiLingo\Parser();
return $wikiLingo->parse($args['object']);
}
else{
- $content = Tiki::lib('parser')->parse_data($args['object'], $args['options']);
+ global $tikilib;
+ $content = $tikilib->parse_data($args['object'], $args['options']);
return $content;
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|