json-rpc - origin, ui update (#407)

* try ace

* .

* update

* ...

* update

* update

* test

* -

* update

* fix

* .

* Revert "."

This reverts commit 631c30f8c0.

* Revert "fix"

This reverts commit be3dbc9cbd.

* Revert "update"

This reverts commit 50fc89e800.

* Revert "-"

This reverts commit 8a6c1fdab3.

* Revert "test"

This reverts commit 50b3641490.

* update schema

* update ui

* flags

* adjustments

assets/webconfig/js/lib/jquery-linedtextarea.js

@@ -1,126 +0,0 @@
-/**
- * jQuery Lined Textarea Plugin 
- *   http://alan.blog-city.com/jquerylinedtextarea.htm
- *
- * Copyright (c) 2010 Alan Williamson
- * 
- * Version: 
- *    $Id: jquery-linedtextarea.js 464 2010-01-08 10:36:33Z alan $
- *
- * Released under the MIT License:
- *    http://www.opensource.org/licenses/mit-license.php
- * 
- * Usage:
- *   Displays a line number count column to the left of the textarea
- *   
- *   Class up your textarea with a given class, or target it directly
- *   with JQuery Selectors
- *   
- *   $(".lined").linedtextarea({
- *   	selectedLine: 10,
- *    selectedClass: 'lineselect'
- *   });
- *
- * History:
- *   - 2010.01.08: Fixed a Google Chrome layout problem
- *   - 2010.01.07: Refactored code for speed/readability; Fixed horizontal sizing
- *   - 2010.01.06: Initial Release
- *
- */
-(function($) {
-
-	$.fn.linedtextarea = function(options) {
-		
-		// Get the Options
-		var opts = $.extend({}, $.fn.linedtextarea.defaults, options);
-		
-		
-		/*
-		 * Helper function to make sure the line numbers are always
-		 * kept up to the current system
-		 */
-		var fillOutLines = function(codeLines, h, lineNo){
-			while ( (codeLines.height() - h ) <= 0 ){
-				if ( lineNo == opts.selectedLine )
-					codeLines.append("<div class='lineno lineselect'>" + lineNo + "</div>");
-				else
-					codeLines.append("<div class='lineno'>" + lineNo + "</div>");
-				
-				lineNo++;
-			}
-			return lineNo;
-		};
-		
-		
-		/*
-		 * Iterate through each of the elements are to be applied to
-		 */
-		return this.each(function() {
-			var lineNo = 1;
-			var textarea = $(this);
-			
-			/* Turn off the wrapping of as we don't want to screw up the line numbers */
-			textarea.attr("wrap", "off");
-			textarea.css({resize:'none'});
-			var originalTextAreaWidth	= textarea.outerWidth();
-
-			/* Wrap the text area in the elements we need */
-			textarea.wrap("<div class='linedtextarea'></div>");
-			var linedTextAreaDiv	= textarea.parent().wrap("<div class='linedwrap' style='width:" + originalTextAreaWidth + "px'></div>");
-			var linedWrapDiv 			= linedTextAreaDiv.parent();
-			
-			linedWrapDiv.prepend("<div class='lines' style='width:50px'></div>");
-			
-			var linesDiv	= linedWrapDiv.find(".lines");
-			linesDiv.height( textarea.height() + 6 );
-			
-			
-			/* Draw the number bar; filling it out where necessary */
-			linesDiv.append( "<div class='codelines'></div>" );
-			var codeLinesDiv	= linesDiv.find(".codelines");
-			lineNo = fillOutLines( codeLinesDiv, linesDiv.height(), 1 );
-
-			/* Move the textarea to the selected line */ 
-			if ( opts.selectedLine != -1 && !isNaN(opts.selectedLine) ){
-				var fontSize = parseInt( textarea.height() / (lineNo-2) );
-				var position = parseInt( fontSize * opts.selectedLine ) - (textarea.height()/2);
-				textarea[0].scrollTop = position;
-			}
-
-			
-			/* Set the width */
-			var sidebarWidth					= linesDiv.outerWidth();
-			var paddingHorizontal 		= parseInt( linedWrapDiv.css("border-left-width") ) + parseInt( linedWrapDiv.css("border-right-width") ) + parseInt( linedWrapDiv.css("padding-left") ) + parseInt( linedWrapDiv.css("padding-right") );
-			var linedWrapDivNewWidth 	= originalTextAreaWidth - paddingHorizontal;
-			var textareaNewWidth			= originalTextAreaWidth - sidebarWidth - paddingHorizontal - 20;
-
-			textarea.width( textareaNewWidth );
-			linedWrapDiv.width( linedWrapDivNewWidth );
-			
-
-			
-			/* React to the scroll event */
-			textarea.scroll( function(tn){
-				var domTextArea		= $(this)[0];
-				var scrollTop 		= domTextArea.scrollTop;
-				var clientHeight 	= domTextArea.clientHeight;
-				codeLinesDiv.css( {'margin-top': (-1*scrollTop) + "px"} );
-				lineNo = fillOutLines( codeLinesDiv, scrollTop + clientHeight, lineNo );
-			});
-
-
-			/* Should the textarea get resized outside of our control */
-			textarea.resize( function(tn){
-				var domTextArea	= $(this)[0];
-				linesDiv.height( domTextArea.clientHeight + 6 );
-			});
-
-		});
-	};
-
-  // default options
-  $.fn.linedtextarea.defaults = {
-  	selectedLine: -1,
-  	selectedClass: 'lineselect'
-  };
-})(jQuery);

assets/webconfig/js/lib/sb-admin-2.js

@@ -5,7 +5,8 @@ $(function() {
 
 });
 
-var oldWidth;
+var mInit = false;
+
 //Loads the correct sidebar on window load,
 //collapses the sidebar on window resize.
 // Sets the min-height of #page-wrapper to window size
@@ -13,28 +14,32 @@ $(function() {
     $(window).bind("load resize", function() {
         var topOffset = 50;
         var width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
-        if(oldWidth != width)
+		if (width < 768)
 		{
-			if (width < 768)
+			if(!mInit)
 			{
+				mInit = true;
 				$('#main-nav').css({"position":"fixed","right":"-235px","top":"45px","width":"230px","border":"1px solid rgba(0, 0, 0, .2)","box-shadow":"0 3px 9px rgba(0, 0, 0, .5)"});
 				topOffset = 100; // 2-row-menu
-				$('.mnava').on('click', function(){
-					$("html, body").animate({ scrollTop: 0 }, "fast");
+				
+				$('.mnava').bind('click.smnav', function(){
 					$( "#main-nav" ).animate({right: "-235px",}, 300 );
 					$(".navbar-toggle").addClass("closed");
 				});
 			}
-			else
-				$( "#main-nav" ).removeAttr("style").css({"position":"absolute"});
+		}
+		else
+		{
+			$( "#main-nav" ).removeAttr('style').css({"position":"fixed"});
+			$( ".mnava" ).unbind('click.smnav');
+			mInit = false;
+		}
 
-
-			var height = ((this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height) - 1;
-			height = height - topOffset;
-			if (height < 1) height = 1;
-			if (height > topOffset) {
-				$("#page-wrapper").css("min-height", (height-11) + "px");
-			}
+		var height = ((this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height) - 1;
+		height = height - topOffset;
+		if (height < 1) height = 1;
+		if (height > topOffset) {
+			$("#page-wrapper").css("min-height", (height-11) + "px");
 		}
     });
 
@@ -55,7 +60,7 @@ $(function() {
     }
 });
 
-$('.navbar-toggle').off().on('click', function(){
+$('.navbar-toggle').on('click', function(){
 	if($('#main-nav').css("right") != "-2px")
 	{
 		 $('#main-nav').animate({right: "-2px",}, 300 );