Merge pull request #7 from scpwiki/develop

The Wikijumpening

Author: danieltharp

Text/Wiki/Parse/Default/Form.php

@@ -75,7 +75,7 @@ function process(&$matches) {
         if (substr($dataYaml, 0, 2) == '%%') {
             $dataYaml = '';
         }
-        $form = Wikidot_Form::fromYaml($formYaml, $dataYaml);
+        $form = Wikijump\Form::fromYaml($formYaml, $dataYaml);
 
         $output = $this->wiki->addToken($this->rule, array('begin' => 1));
 

Text/Wiki/Render/Xhtml/Bibcite.php

@@ -43,7 +43,7 @@ function token($options) {
         if ($id === null) {
             return '<span class="error-inline">Bibliography item <em>' . $label . '</em> not found.</span>';
         }
-        $out = '<a href="javascript:;" class="bibcite" id="bibcite-' . $id . '"' . ' onclick="WIKIDOT.page.utils.scrollToReference(\'bibitem-' . $idPrefix . $id . '\')">' . $id . '</a>';
+        $out = '<a href="javascript:;" class="bibcite" id="bibcite-' . $id . '"' . ' onclick="Wikijump.page.utils.scrollToReference(\'bibitem-' . $idPrefix . $id . '\')">' . $id . '</a>';
         return $out;
     }
 }

Text/Wiki/Render/Xhtml/Button.php

@@ -58,16 +58,16 @@ function token($options){
     	);
 
     	$jsOnclick = array(
-    		'edit' => 'WIKIDOT.page.listeners.editClick(event)',
-    		'edit-append' => 'WIKIDOT.page.listeners.append(event)',
-    		'edit-sections' => 'WIKIDOT.page.listeners.toggleEditSections(event)',
-    		'history' => ' WIKIDOT.page.listeners.historyClick(event)',
-    		'print' => 'WIKIDOT.page.listeners.printClick(event)',
-    		'files' => 'WIKIDOT.page.listeners.filesClick(event)',
-    		'tags' => 'WIKIDOT.page.listeners.editTags(event)',
-    		'source' => 'WIKIDOT.page.listeners.viewSourceClick(event)',
+    		'edit' => 'Wikijump.page.listeners.editClick(event)',
+    		'edit-append' => 'Wikijump.page.listeners.append(event)',
+    		'edit-sections' => 'Wikijump.page.listeners.toggleEditSections(event)',
+    		'history' => ' Wikijump.page.listeners.historyClick(event)',
+    		'print' => 'Wikijump.page.listeners.printClick(event)',
+    		'files' => 'Wikijump.page.listeners.filesClick(event)',
+    		'tags' => 'Wikijump.page.listeners.editTags(event)',
+    		'source' => 'Wikijump.page.listeners.viewSourceClick(event)',
     		'talk' => "window.location.href='/talk:'+WIKIREQUEST.info.pageUnixName",
-    		'backlinks' => 'WIKIDOT.page.listeners.backlinksClick(event)'
+    		'backlinks' => 'Wikijump.page.listeners.backlinksClick(event)'
 
     	);
 

Text/Wiki/Render/Xhtml/Embed.php

@@ -42,7 +42,7 @@ class Text_Wiki_Render_Xhtml_Embed extends Text_Wiki_Render {
     public function Text_Wiki_Render_Xhtml_Embed($obj) {
         parent::Text_Wiki_Render($obj);
 
-        $patternDir = WIKIDOT_ROOT . '/conf/wikiparser/embed';
+        $patternDir = WIKIJUMP_ROOT . '/conf/wikiparser/embed';
         $files = glob($patternDir . '/*.php');
         foreach ($files as $f) {
             require $f;

Text/Wiki/Render/Xhtml/Equationreference.php

@@ -41,7 +41,7 @@ function token($options) {
         $refs = Text_Wiki_Parse_Math::$equationsArray;
         $id = $refs[$label];
         $idPrefix = $this->wiki->getRenderConf('xhtml', 'math', 'id_prefix');
-        $out = '<a class="eref" href="javascript:;" onclick="WIKIDOT.page.utils.scrollToReference(\'equation-' . $idPrefix . $id . '\')">' . $id . '</a>';
+        $out = '<a class="eref" href="javascript:;" onclick="Wikijump.page.utils.scrollToReference(\'equation-' . $idPrefix . $id . '\')">' . $id . '</a>';
 
         return $out;
     }

Text/Wiki/Render/Xhtml/Footnote.php

@@ -41,7 +41,7 @@ function token($options) {
         $refs = Text_Wiki_Parse_Math::$equationsArray;
         $id = $options['id'];
         $idPrefix = $this->getConf("id_prefix");
-        $out = '<sup class="footnoteref"><a id="footnoteref-' . $idPrefix . $id . '" href="javascript:;" class="footnoteref"' . ' onclick="WIKIDOT.page.utils.scrollToReference(\'footnote-' . $idPrefix . $id . '\')">' . $id . '</a></sup>';
+        $out = '<sup class="footnoteref"><a id="footnoteref-' . $idPrefix . $id . '" href="javascript:;" class="footnoteref"' . ' onclick="Wikijump.page.utils.scrollToReference(\'footnote-' . $idPrefix . $id . '\')">' . $id . '</a></sup>';
         return $out;
     }
 }

Text/Wiki/Render/Xhtml/Footnoteblock.php

@@ -62,7 +62,7 @@ function token($options) {
     		foreach($footnotes as $id => $content){
     			$out .= '<div class="footnote-footer" id="footnote-'.$id.'">';
     			$out .= '<a href="javascript:;" ' .
-    					'onclick="WIKIDOT.page.utils.scrollToReference(\'footnoteref-'.$id.'\')">'.$id . '</a>. ' .
+    					'onclick="Wikijump.page.utils.scrollToReference(\'footnoteref-'.$id.'\')">'.$id . '</a>. ' .
     							'<span class="content">'.$content.'</span>';
     			$out .= '</div>';
     		}

Text/Wiki/Render/Xhtml/Footnoteitem.php

@@ -41,7 +41,7 @@ function token($options) {
             $idPrefix = $this->wiki->getRenderConf('xhtml', 'footnote', 'id_prefix');
             $id = $options['id'];
             $out = '<div class="footnote-footer" id="footnote-' . $idPrefix . $id . '">';
-            $out .= '<a href="javascript:;" ' . 'onclick="WIKIDOT.page.utils.scrollToReference(\'footnoteref-' . $idPrefix . $id . '\')">' . $id . '</a>. ';
+            $out .= '<a href="javascript:;" ' . 'onclick="Wikijump.page.utils.scrollToReference(\'footnoteref-' . $idPrefix . $id . '\')">' . $id . '</a>. ';
             return $out;
         }
         if ($options['type'] == 'end') {

Text/Wiki/Render/Xhtml/Form.php

@@ -49,7 +49,7 @@ function token($options)
             return '</table>';
         }
 
-        $field = Wikidot_Form_Field::field($options['field']);
+        $field = Wikijump\Form\Field::field($options['field']);
         $h_label = htmlspecialchars($options['field']['label']);
         $h_value = $field->renderView();
 

Text/Wiki/Render/Xhtml/Math.php

@@ -46,7 +46,7 @@ function token($options) {
             mkdirfull($dir);
         }
 
-        $tmpDir = WIKIDOT_ROOT . '/tmp/math';
+        $tmpDir = WIKIJUMP_ROOT . '/tmp/math';
         if (!file_exists($tmpDir)) {
             mkdirfull($tmpDir);
         }