Merge branch 'master' of https://github.com/opensource9ja/notebookjs

Author: risenW

notebookjs/src/public/javascripts/index.js

@@ -380,11 +380,13 @@ function update_text_box_size() {
 $("#download").click(function () {
     let out = notebook_json(cells_order, vars_in_scope, md_texts);
 
-    var blob = new Blob([out], { "type": "application/json" });
-    var url = (window.URL || window.webkitURL).createObjectURL(blob);
+    let blob = new Blob([out], { "type": "application/json" });
+    let url = (window.URL || window.webkitURL).createObjectURL(blob);
 
-    var link = document.createElement('a');
-    link.download = 'danfo_notebook.json';
+    let link = document.createElement('a');
+    let text = $("#notebookname").text()
+    let name = text.length > 0 ? `${text}.json` : "Dnotebook.json"
+    link.download = name;
     link.href = url;
 
     var link_pae = $(link);
@@ -436,6 +438,21 @@ $("#import-notebook-file").change(() => {
 
 
 
+async function load_data(path) {
+    document.getElementById("cell-running").style.display = "block"
+    let df = await dfd.read_csv(path)
+    document.getElementById("cell-running").style.display = "none"
+    return df
+
+}
+
+$("#closename").click(function(){
+
+    let textval = $("#namebook").val()
+    
+    $("#notebookname").html(`<h2>${textval}</h2>`)
+});
+
 
 
 

notebookjs/src/public/javascripts/utils.js

@@ -99,9 +99,14 @@ function this_div() {
 //     $(`${id}`).append(`<div id=${name}></div>`)
 
 //     let cb = callback(name);
+function viz(name, callback) {
+    // out_div-1
 
-//     return cb
-// }
+    let id = `#out_${window.current_cell}`
+    $(`${id}`).append(`<div id=${name}></div>`)
+
+    return cb
+}
 
 function table(df) {
 
@@ -305,10 +310,11 @@ function html_load(new_id) {
 
 function load_notebook(json) {
 
-
+    cells_order = []
     for (let key in json) {
 
         let id = key.split("-")[1]
+        
 
         if (Object.prototype.hasOwnProperty.call(json[key], "in")) {
             let html = html_load(id)
@@ -326,6 +332,7 @@ function load_notebook(json) {
             editor.getDoc().setValue(input);
 
             vars_in_scope[`div-${id}`] = editor
+            cells_order.push(`div-${id}`)
 
             let out = json[key]["out"]
 
@@ -362,6 +369,7 @@ function load_notebook(json) {
             md_texts[`text-div_${Number(id)}`] = md_out;
 
             vars_in_scope[`div_text-${id}`] = ""
+            cells_order.push(`div_text-${id}`)
 
             $(`textarea#text-box_${id}`).addClass("text-box")
             $(`textarea#text-box_${id}`).val(md_out)

notebookjs/src/views/layout.hbs

@@ -46,6 +46,8 @@
       <span class="navbar-toggler-icon"></span>
     </button>
 
+    <div style="margin-right: 150px;color:white;" id="notebookname"></div>
+
     <div style="margin-right: 200px;" class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav ml-auto">
         <li class="nav-item">
@@ -65,6 +67,7 @@
             Options
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <a class="dropdown-item" data-toggle="modal" data-target="#nameNoteModal" href="#">Name Notebook</a>
             <a class="dropdown-item" id="download" href="#">Download Notebook</a>
             <a class="dropdown-item" data-toggle="modal" data-target="#uploadNoteModal" href="#">Upload Notebook</a>
 
@@ -111,6 +114,29 @@
       </div>
     </div>
   </div>
+  {{!-- Notebook Name Modal--}}
+  <div class="modal" id="nameNoteModal" tabindex="-1">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">Name Your Notebook</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <form>
+            <div class="form-group">
+              <input type="text" class="form-control-file" name="name-notebook" id="namebook">
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal" id="closename">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
 
 
   {{{body}}}