nitdoc: migrate javascript plugins
authorAlexandre Terrasa <alexandre@moz-code.org>
Fri, 6 Jun 2014 16:55:10 +0000 (12:55 -0400)
committerAlexandre Terrasa <alexandre@moz-code.org>
Fri, 6 Jun 2014 18:43:42 +0000 (14:43 -0400)
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

share/nitdoc/css/Nitdoc.GitHub.css
share/nitdoc/css/Nitdoc.QuickSearch.css
share/nitdoc/js/nitdoc.js
share/nitdoc/js/plugins/github.js
share/nitdoc/js/plugins/github/loginbox.js
share/nitdoc/js/plugins/quicksearch.js

index bba519c..a2d675f 100644 (file)
  * Nitdoc Github Login Box\r
  */\r
 \r
-#nitdoc-github-li {\r
-       float: left;\r
-       padding: 0;\r
-       margin: -2px 5px 5px 15px;\r
-}\r
-\r
 #nitdoc-github-li.current {\r
        color: #999;\r
 }\r
 \r
-#nitdoc-github-li .nitdoc-github-li-img {\r
-       width: 20px;\r
+#nitdoc-github-li .glyphicon {\r
        cursor: pointer;\r
 }\r
 \r
        text-align:center;\r
 }\r
 \r
-#nitdoc-github-loginbox input {\r
-       width: 212px;\r
-       height: 20px;\r
-       padding: 3px;\r
-       margin: 5px 0px 5px 0px;\r
-       color: black;\r
-       font-style: normal;\r
-       font-size: 12px;\r
-       border: 1px solid #CCC;\r
-}\r
-\r
-#nitdoc-github-loginbox button {\r
-       margin-top: 15px;\r
-       width: 220px;\r
-       font-weight: bold;\r
-}\r
-\r
 #nitdoc-github-loginbox h4 {\r
        display: block;\r
        width: 100%;\r
        color: #0D8921;\r
 }\r
 \r
-/* \r
- * Nitdoc Github buttons\r
- */\r
-\r
-.nitdoc-github-button {\r
-       display: inline-block;\r
-       cursor: pointer;\r
-       background-color: #92C929;\r
-       background-image: -webkit-gradient(linear, left top, left bottom, from(#92C929), to(#1d7900)); /* Saf4+, Chrome */\r
-       background-image: -webkit-linear-gradient(top, #92C929, #1d7900); /* Chrome 10+, Saf5.1+ */\r
-       background-image:    -moz-linear-gradient(top, #92C929, #1d7900); /* FF3.6 */\r
-       background-image:     -ms-linear-gradient(top, #92C929, #1d7900); /* IE10 */\r
-       background-image:      -o-linear-gradient(top, #92C929, #1d7900); /* Opera 11.10+ */\r
-       background-image:         linear-gradient(top, #92C929, #1d7900);\r
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#92C929', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-       border-radius: 2px;\r
-       -moz-border-radius: 2px;\r
-       -webkit-border-radius: 2px;\r
-       -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;\r
-       box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -moz-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -webkit-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       border: 1px solid #1d7900;\r
-       color: #fff;\r
-       font-size: 14px;\r
-       padding: 5px 7px 5px 7px;\r
-       text-align: center;\r
-}\r
-\r
-button.nitdoc-github-button[disabled=disabled] {\r
-       background-color: #999999;\r
-       background-image: -webkit-gradient(linear, left top, left bottom, from(#999999), to(#333333)); /* Saf4+, Chrome */\r
-       background-image: -webkit-linear-gradient(top, #999999, #333333); /* Chrome 10+, Saf5.1+ */\r
-       background-image:    -moz-linear-gradient(top, #999999, #333333); /* FF3.6 */\r
-       background-image:     -ms-linear-gradient(top, #999999, #333333); /* IE10 */\r
-       background-image:      -o-linear-gradient(top, #999999, #333333); /* Opera 11.10+ */\r
-       background-image:         linear-gradient(top, #999999, #333333);\r
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#999999', EndColorStr='#333333'); /* IE6–IE9 */\r
-       border: 1px solid #333333;\r
-}\r
-\r
-button.nitdoc-github-button img {\r
-       margin-right: 7px;\r
-       margin-bottom: -3px;\r
-       height: 16px;\r
-       width: 16px;\r
-}\r
-\r
 /* Comment editing */\r
 \r
 .nitdoc-github-commentbox {\r
index 42b3925..81bba5d 100644 (file)
  * Nitdoc Quick Search JS module \r
  */\r
 \r
-#nitdoc-qs-li {\r
-       float: right;\r
-       padding: 0;\r
-       margin: 0;\r
-}\r
-\r
 #nitdoc-qs-field {\r
        width: 300px;\r
-}\r
-\r
-#nitdoc-qs-field.nitdoc-qs-field-notused {\r
-       color: #999;\r
-       font-style: italic;\r
+       margin-top: 3px;\r
 }\r
 \r
 #nitdoc-qs-table {\r
index 73d33a4..0c90d58 100644 (file)
@@ -9,18 +9,17 @@ require.config({
                quicksearchList: searchList,
                jQueryUI: "jquery-ui",
     },
-       shim: {
+       /*shim: {
                "jQueryUI": {
                    export: "$",
                    deps: ['jquery']
                }
-       }
+       }*/
 });
 
 // nitdoc main module
 define([
-       "plugins/folding",
-       "plugins/filtering",
+       //"plugins/filtering",
        "plugins/quicksearch",
        "plugins/github",
 ], function() {});
index 84ad4f2..c77c0d0 100644 (file)
@@ -46,11 +46,21 @@ define([
                        this.origin = this._parseUpstream(upstream);\r
                        this._initMarked();\r
                        // Add github menu\r
-                       $("nav.main ul").append(\r
-                               $("<li/>")\r
-                               .attr("id", "nitdoc-github-li")\r
+                       $("#topmenu>.container-fluid").append(\r
+                               $("<a/>")\r
+                               .attr({\r
+                                       "id": "nitdoc-github-li",\r
+                                       "type": "button",\r
+                                       "class": "navbar-btn navbar-right btn-link",\r
+                                       "href": "#",\r
+                                       "data-container": "body",\r
+                                       "data-toggle": "popover",\r
+                                       "data-placement": "bottom",\r
+                                       "data-content": "bottom",\r
+                                       "data-html": "true",\r
+                               })\r
                                .loginbox()\r
-                               .loginbox("displayLogin")\r
+                               //.loginbox("displayLogin")\r
                                .bind("loginbox_logoff", function() {\r
                                        GithubUI.disactivate();\r
                                })\r
@@ -124,7 +134,7 @@ define([
                                                .modalbox("open");\r
                                        } else if(isok == "error:sha") {\r
                                                $("<p/>")\r
-                                               .text("The provided Github repository must contain the base commit '" + UI.origin.sha + "'.")\r
+                                               .text("The provided Github repository must contain the base commit '" + this.origin.sha + "'.")\r
                                                .modalbox({\r
                                                        title: "Github base commit error",\r
                                                        isError: true\r
index 119b5e8..55fbffe 100644 (file)
@@ -40,16 +40,16 @@ define([
 \r
                _create: function() {\r
                        this.element.append(\r
-                               $("<a/>")\r
-                               .append(\r
-                                       $("<img/>")\r
-                                       .attr({\r
-                                               src: this.options.icon,\r
-                                               alt: this.options.iconAlt\r
-                                       })\r
-                                       .addClass("nitdoc-github-li-img")\r
-                               )\r
-                               .click($.proxy(this.toggle, this))\r
+                               $("<span/>")\r
+                               .addClass("glyphicon glyphicon-off")\r
+                               //.click($.proxy(this.toggle, this))\r
+                               .attr({\r
+                                       "data-container": "body",\r
+                                       "data-toggle": "popover",\r
+                                       "data-placement": "bottom",\r
+                                       "data-content": "bottom",\r
+                                       "data-html": "true",\r
+                               })\r
                        );\r
 \r
                        this.content = $("<div/>");\r
@@ -133,56 +133,77 @@ define([
                                $("<form/>")\r
                                .keyup($.proxy(this._doFormChange, this))\r
                                .append(\r
-                                       $("<label/>")\r
-                                       .attr("for", "nitdoc-github-login-field")\r
-                                       .append(this.options.usernameTxt)\r
-                               )\r
-                               .append(\r
-                                       $("<input/>")\r
-                                       .attr({\r
-                                               id: "nitdoc-github-login-field",\r
-                                               type: "text"\r
-                                       })\r
-                               )\r
-                               .append(\r
-                                       $("<label/>")\r
-                                       .attr("for", "nitdoc-github-password-field")\r
-                                       .append(this.options.passwordTxt)\r
-                               )\r
-                               .append(\r
-                                       $("<input/>")\r
-                                       .attr({\r
-                                               id: "nitdoc-github-password-field",\r
-                                               type: "password"\r
-                                       })\r
-                               )\r
-                               .append(\r
-                                       $("<label/>")\r
-                                       .attr("for", "nitdoc-github-repo-field")\r
-                                       .append(this.options.repoTxt)\r
+                                       $("<div/>")\r
+                                       .addClass("form-group")\r
+                                       .append(\r
+                                               $("<label/>")\r
+                                               .attr("for", "nitdoc-github-login-field")\r
+                                               .append(this.options.usernameTxt)\r
+                                       )\r
+                                       .addClass("form-group")\r
+                                       .append(\r
+                                               $("<input/>")\r
+                                               .attr({\r
+                                                       id: "nitdoc-github-login-field",\r
+                                                       type: "text",\r
+                                                       "class": "form-control"\r
+                                               })\r
+                                       )\r
                                )\r
                                .append(\r
-                                       $("<input/>")\r
-                                       .attr({\r
-                                               id: "nitdoc-github-repo-field",\r
-                                               type: "text"\r
-                                       })\r
+                                       $("<div/>")\r
+                                       .addClass("form-group")\r
+                                       .append(\r
+                                               $("<label/>")\r
+                                               .attr("for", "nitdoc-github-password-field")\r
+                                               .append(this.options.passwordTxt)\r
+                                       )\r
+                                       .append(\r
+                                               $("<input/>")\r
+                                               .attr({\r
+                                                       id: "nitdoc-github-password-field",\r
+                                                       type: "password",\r
+                                                       "class": "form-control"\r
+                                               })\r
+                                       )\r
                                )\r
                                .append(\r
-                                       $("<label/>")\r
-                                       .attr("for", "nitdoc-github-branch-field")\r
-                                       .append(this.options.branchTxt)\r
+                                       $("<div/>")\r
+                                       .addClass("form-group")\r
+                                       .append(\r
+                                               $("<label/>")\r
+                                               .attr("for", "nitdoc-github-repo-field")\r
+                                               .append(this.options.repoTxt)\r
+                                       )\r
+                                       .append(\r
+                                               $("<input/>")\r
+                                               .attr({\r
+                                                       id: "nitdoc-github-repo-field",\r
+                                                       type: "text",\r
+                                                       "class": "form-control"\r
+                                               })\r
+                                       )\r
                                )\r
                                .append(\r
-                                       $("<input/>")\r
-                                       .attr({\r
-                                               id: "nitdoc-github-branch-field",\r
-                                               type: "text"\r
-                                       })\r
+                                       $("<div/>")\r
+                                       .addClass("form-group")\r
+                                       .append(\r
+                                               $("<label/>")\r
+                                               .attr("for", "nitdoc-github-branch-field")\r
+                                               .append(this.options.branchTxt)\r
+                                       )\r
+                                       .append(\r
+                                               $("<input/>")\r
+                                               .attr({\r
+                                                       id: "nitdoc-github-branch-field",\r
+                                                       type: "text",\r
+                                                       "class": "form-control"\r
+                                               })\r
+                                       )\r
                                )\r
                                .append(\r
                                        $("<button/>")\r
-                                       .addClass("nitdoc-github-button")\r
+                                       .addClass("nitdoc-github-button btn btn-primary btn-lg pull-right")\r
                                        .attr("disabled", "disabled")\r
                                        .append(\r
                                                $("<img/>")\r
index c4cd682..12c124a 100644 (file)
@@ -29,10 +29,8 @@ define([
 
                options: {
                        list: {}, // List of raw results generated by nitdoc tool
-                       fieldNotUsedClass: "nitdoc-qs-field-notused",
                        fieldAttrs: {
                                autocomplete: "off",
-                               value: "quick search..."
                        },
                        tableID: "nitdoc-qs-table",
                        tableCSS: {
@@ -56,11 +54,8 @@ define([
                _create: function() {
                        this.element
                                .attr(this.options.fieldAttrs)
-                               .addClass(this.options.fieldNotUsedClass)
                                .keydown($.proxy(this._doKeyDown, this))
                                .keyup($.proxy(this._doKeyUp, this))
-                               .focusout($.proxy(this._doFocusOut, this))
-                               .focusin($.proxy(this._doFocusIn, this));
 
                        this._table = $("<table/>")
                                .attr("id", this.options.tableID)
@@ -93,28 +88,14 @@ define([
                                        break;
                                case 13: // Enter
                                        this._loadResult();
-                                       break;
+                                       return false;
                                case 27: // Escape
                                        this.element.blur();
                                        this.closeTable();
-                                       break;
+                                       return true;
                                default: // Other keys
                                        utils.delayEvent($.proxy(this.search, this));
-                                       break;
-                       }
-               },
-
-               _doFocusOut: function() {
-                       if(this.element.val() == "") {
-                               this.element.addClass(this.options.fieldNotUsedClass);
-                               this.element.val(this.options.fieldAttrs.value);
-                       }
-               },
-
-               _doFocusIn: function() {
-                       if(this.element.val() == this.options.fieldAttrs.value) {
-                               this.element.removeClass(this.options.fieldNotUsedClass);
-                               this.element.val("");
+                                       return true;
                        }
                },
 
@@ -378,16 +359,21 @@ define([
        });
 
        var searchField = $("<input/>")
-       .addClass("nitdoc-qs-field-notused")
+       .addClass("form-control input-sm")
        .attr({
                id: "nitdoc-qs-field",
                type: "text",
+               placeholder: "Search..."
        })
 
-       $("nav.main ul").append(
-               $("<li/>")
-                       .attr("id", "nitdoc-qs-li")
-                       .append(searchField)
+       $("#topmenu>.container-fluid").append(
+               $("<div>")
+               .addClass("navbar-form navbar-right")
+               .append(
+                       $("<div>")
+                       .addClass("form-group")
+                       .append(searchField)
+               )
        );
 
        searchField.quicksearch({