merge

.gitignore

@@ -1 +1,3 @@
 /nbproject
+/node_modules
+/bower_modules

CHANGELOG.txt

@@ -1,3 +1,10 @@
+== 0.3.0 - 03 February 2015
+* Perfomance optimization
+* Bootstrap 3 update
+* Add minifiyed js
+* Add npm installation
+* Add borew installation
+
 == 0.2.1 - 21 January 2014
 * Add events support
 

Gruntfile.js

@@ -0,0 +1,23 @@
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= pkg.version %> */\n'
+      },
+      build: {
+        src: 'js/jquery.treegrid.js',
+        dest: 'js/jquery.treegrid.min.js'
+      }
+    }
+  });
+
+  // Load the plugin that provides the "uglify" task.
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+
+  // Default task(s).
+  grunt.registerTask('default', ['uglify']);
+
+};

README.md

@@ -1,6 +1,21 @@
-jquery-treegrid
-===============
-
 TreeGrid plugin for jQuery
+==========
+
+See more information at http://maxazan.github.io/jquery-treegrid
+
+## Installation
+
+
+### Using npm
+```
+npm install jquery-treegrid
+```
+
+### Using bower
+```
+bower install jquery-treegrid
+```
+
+### From source
 
-See more information at http://maxazan.github.io/jquery-treegrid
+Download [source](https://github.com/maxazan/jquery-treegrid/archive/master.zip) from github.com

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery-treegrid",
   "description": "TreeGrid plugin for jQuery.",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "homepage": "http://maxazan.github.io/jquery-treegrid",
   "license": "MIT",
   "ignore": [
@@ -26,5 +26,8 @@
   "dependencies": {
     "jquery": ">= 1.9.1",
     "jquery.cookie": ">= 1.4.1"
-  }
+  },
+  "authors": [
+    "Maksym Pomazan"
+  ]
 }

examples/example-basic.html → docs/examples/example-basic.html

@@ -5,20 +5,20 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <title>Jquery-treegrid basic example</title>
 
-    <link rel="stylesheet" href="../styles.css">
-    <link rel="stylesheet" href="http://yandex.st/highlightjs/7.3/styles/default.min.css">
-    <link rel="stylesheet" href="../css/jquery.treegrid.css">
+    <link rel="stylesheet" href="../css/styles.css">
+    <link rel="stylesheet" href="../css/default.min.css">
+    <link rel="stylesheet" href="../../css/jquery.treegrid.css">
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script type="text/javascript" src="../js/jquery.treegrid.js"></script>
+    <script src="../js/jquery.min.js"></script>
+    <script type="text/javascript" src="../../js/jquery.treegrid.js"></script>
     <script type="text/javascript">
       $(document).ready(function() {
         $('.tree').treegrid();
       });
     </script>
 
 
-    <script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script>
+    <script src="../js/highlight.min.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
     <script>
       (function(i, s, o, g, r, a, m) {

examples/example-bootstrap-2.html → docs/examples/example-bootstrap-2.html

@@ -10,15 +10,17 @@
         <title>TreeGrid for Bootstrap 2.3.x</title>
 
         <!-- Bootstrap core CSS -->
-        <link href="bootstrap-2.3.2/css/bootstrap.css" rel="stylesheet">
-        <link rel="stylesheet" href="../css/jquery.treegrid.css">
-        <link rel="stylesheet" href="http://yandex.st/highlightjs/7.3/styles/default.min.css">
-        <script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script>
-		<script>hljs.initHighlightingOnLoad();</script>
+        <link rel="stylesheet" href="../css/default.min.css">
+        <link rel="stylesheet" href="../../css/jquery.treegrid.css">
+        <link rel="stylesheet" href="bootstrap-2.3.2/css/bootstrap.css">
 
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-        <script type="text/javascript" src="../js/jquery.treegrid.js"></script>
-        <script type="text/javascript" src="../js/jquery.treegrid.bootstrap2.js"></script>
+        <script type="text/javascript"  src="../js/jquery.min.js"></script>
+        <script type="text/javascript" src="../../js/jquery.treegrid.js"></script>
+        <script type="text/javascript" src="../../js/jquery.treegrid.bootstrap2.js"></script>
+
+        <script type="text/javascript"  src="../js/highlight.min.js"></script>
+		<script>hljs.initHighlightingOnLoad();</script>
+
         <script type="text/javascript">
             $(document).ready(function() {
                 $('.tree').treegrid();

docs/examples/example-bootstrap-3.html

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+
+    <title>TreeGrid for Bootstrap 3.0.x</title>
+
+    <!-- Bootstrap core CSS -->
+
+    <link rel="stylesheet" href="../css/default.min.css">
+    <link rel="stylesheet" href="../../css/jquery.treegrid.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+
+    <script type="text/javascript"  src="../js/jquery.min.js"></script>
+    <script type="text/javascript" src="../../js/jquery.treegrid.js"></script>
+    <script type="text/javascript" src="../../js/jquery.treegrid.bootstrap3.js"></script>
+
+    <script type="text/javascript"  src="../js/highlight.min.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
+
+    <script type="text/javascript">
+
+        $(document).ready(function () {
+            $('.tree').treegrid();
+            $('.tree-2').treegrid({
+                expanderExpandedClass: 'glyphicon glyphicon-minus',
+                expanderCollapsedClass: 'glyphicon glyphicon-plus'
+            });
+
+        });
+    </script>
+    <script>
+        (function (i, s, o, g, r, a, m) {
+            i['GoogleAnalyticsObject'] = r;
+            i[r] = i[r] || function () {
+                (i[r].q = i[r].q || []).push(arguments)
+            }, i[r].l = 1 * new Date();
+            a = s.createElement(o),
+                m = s.getElementsByTagName(o)[0];
+            a.async = 1;
+            a.src = g;
+            m.parentNode.insertBefore(a, m)
+        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+
+        ga('create', 'UA-43342702-1', 'maxazan.github.io');
+        ga('send', 'pageview');
+
+    </script>
+</head>
+
+<body>
+    <div class="container">
+
+        <h1><a href="http://maxazan.github.io/jquery-treegrid/">TreeGrid</a> Bootstrap 3 examples</h1>
+
+        <table class="table tree">
+            <tr class="treegrid-1">
+                <td>Root node 1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-2 treegrid-parent-1">
+                <td>Node 1-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-3 treegrid-parent-1">
+                <td>Node 1-2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-4 treegrid-parent-3">
+                <td>Node 1-2-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-5">
+                <td>Root node 2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-6 treegrid-parent-5">
+                <td>Node 2-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-7 treegrid-parent-5">
+                <td>Node 2-2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-8 treegrid-parent-7">
+                <td>Node 2-2-1</td>
+                <td>Additional info</td>
+            </tr>
+        </table>
+        <h3>Code</h3>
+
+        <pre><code class="html">&lt;link href=&quot;bootstrap-3.0.0/css/bootstrap.css&quot; rel=&quot;stylesheet&quot;&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;../css/jquery.treegrid.css&quot;&gt;
+
+&lt;script type=&quot;text/javascript&quot; src=&quot;../js/jquery.treegrid.js&quot;&gt;&lt;/script&gt;
+&lt;script type=&quot;text/javascript&quot; src=&quot;../js/jquery.treegrid.bootstrap3.js&quot;&gt;&lt;/script&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+    $(document).ready(function() {
+        $(&#39;.tree&#39;).treegrid();
+    });
+&lt;/script&gt;</code></pre>
+        <h2>Bootstrap TreeGrid example<br>
+            table-bordered table-striped table-condensed<br>
+            custom expander</h2>
+        <table class="table tree-2 table-bordered table-striped table-condensed">
+            <tr class="treegrid-1">
+                <td>Root node 1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-2 treegrid-parent-1">
+                <td>Node 1-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-3 treegrid-parent-1">
+                <td>Node 1-2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-4 treegrid-parent-3">
+                <td>Node 1-2-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-5">
+                <td>Root node 2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-6 treegrid-parent-5">
+                <td>Node 2-1</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-7 treegrid-parent-5">
+                <td>Node 2-2</td>
+                <td>Additional info</td>
+            </tr>
+            <tr class="treegrid-8 treegrid-parent-7">
+                <td>Node 2-2-1</td>
+                <td>Additional info</td>
+            </tr>
+        </table>
+
+        <h3>Code</h3>
+        <pre><code class="html">&lt;link href=&quot;bootstrap-3.0.0/css/bootstrap.css&quot; rel=&quot;stylesheet&quot;&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;../css/jquery.treegrid.css&quot;&gt;
+
+&lt;script type=&quot;text/javascript&quot; src=&quot;../js/jquery.treegrid.js&quot;&gt;&lt;/script&gt;
+&lt;script type=&quot;text/javascript&quot; src=&quot;../js/jquery.treegrid.bootstrap3.js&quot;&gt;&lt;/script&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+    $(document).ready(function() {
+        $(&#39;.tree&#39;).treegrid({
+                    expanderExpandedClass: &#39;glyphicon glyphicon-minus&#39;,
+                    expanderCollapsedClass: &#39;glyphicon glyphicon-plus&#39;
+                });
+    });
+&lt;/script&gt;</code></pre>
+    </div> <!-- /container -->
+
+
+    <!-- Bootstrap core JavaScript
+        ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+</body>
+
+</html>