Skip to content

K
kityminder-core
Commit 031003c9 authored by techird's avatar techird
Browse files
Options

Merge branch 'gh-pages' into dev

parents f0b27299 e50ce4be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8002 additions and 7 deletions
demo/dev.html
View file @ 031003c9
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<script src="../dist/jquery-2.1.0.min.js"></script> <script src="../dist/jquery-2.1.0.min.js"></script>
<script src="../kity/dist/kitygraph.all.js"></script> <script src="../kity/dist/kitygraph.all.js"></script>
<script src="../configure.js"></script> <script src="../configure.js"></script>
<script src="../dist/dev.php"></script> <script src="../dist/dev.js"></script>
<script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script> <script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
<link href="../themes/default/_css/import.css" type="text/css" rel="stylesheet"> <link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
<style> <style>
.km_receiver{ .km_receiver{
width:0; width:0;
......
dist/dev.js 0 → 100644
View file @ 031003c9
This diff is collapsed.
dist/dev.php
View file @ 031003c9
...@@ -74,9 +74,9 @@ $dependency = Array( ...@@ -74,9 +74,9 @@ $dependency = Array(
$content = ""; $content = "";
header('Content-Type: text/javascript; charset=utf-8');
foreach ($dependency as $index => $dep) { foreach ($dependency as $index => $dep) {
if( $_GET['join'] != null) { if( $_GET['join'] != null || $argv[1] == 'join') {
header('Content-Type: text/javascript; charset=utf-8');
echo file_get_contents("../$dep")."\n\n"; echo file_get_contents("../$dep")."\n\n";
} else { } else {
echo "document.write('<script charset=utf-8 src=\"../$dep\"></script>');"; echo "document.write('<script charset=utf-8 src=\"../$dep\"></script>');";
......
dist/index.html
View file @ 031003c9
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
<html> <html>
<head> <head>
<meta charset="utf-8">
<script src="jquery-2.1.0.min.js" charset="utf-8"></script> <script src="jquery-2.1.0.min.js" charset="utf-8"></script>
<script src="baidu-frontia-js-full-1.0.0.js" charset="utf-8"></script> <script src="baidu-frontia-js-full-1.0.0.js" charset="utf-8"></script>
<script src="social.js" charset="utf-8"></script> <script src="social.js" charset="utf-8"></script>
<script src="../kity/dist/kitygraph.all.js"></script> <script src="../kity/dist/kitygraph.all.js" charset="utf-8"></script>
<script src="../configure.js"></script> <script src="../configure.js" charset="utf-8"></script>
<script src="../dist/dev.php"></script> <script src="../dist/dev.js" charset="utf-8"></script>
<script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script> <script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
<link href="../themes/default/css/import.css" type="text/css" rel="stylesheet"> <link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
<link rel="stylesheet" href="social.css"> <link rel="stylesheet" href="social.css">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment