diff --git a/css/main.css b/css/main.css index 14ba420..9af702a 100644 --- a/css/main.css +++ b/css/main.css @@ -784,6 +784,53 @@ border:1px solid #EBEBEB; } +.bd-alert { + position: absolute; + width:600px; + height:200px; + left: 0; + right: 0; + top: 300px; + background-color: #2E3136; + margin: auto; + border:1px solid #323232; + box-shadow: 0 0 5px 3px rgba(30,30,30,0.5); + color:#EBEBEB; +} + +.bd-alert-header { + height:25px; + background: #36393E; +} + +.bd-alert-header span { + line-height: 25px; + margin-left:5px; +} + +.bd-alert-closebtn { + cursor: pointer; + float:right; + margin-right:5px; + margin-top:2px; +} + +.bd-alert-closebtn:hover { + color:#ADADAD; +} + +.bd-alert-body { + height:178px; +} + +.bd-alert-body .scroller-wrap { + height:178px; +} + +.bd-alert-body .scroller-wrap .scroller { + padding:5px; + word-wrap:break-word; +} /*CODEMIRROR*/ .CodeMirror{font-family:monospace;height:300px;color:#000;background-color:#EBEBEB !important;}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0} diff --git a/js/main.js b/js/main.js index c24a8aa..b23c00b 100644 --- a/js/main.js +++ b/js/main.js @@ -9,7 +9,7 @@ var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule; var jsVersion = 1.55; -var supportedVersion = "0.2.3"; +var supportedVersion = "0.2.0"; var mainObserver; @@ -48,11 +48,11 @@ var defaultCookie = { "version": jsVersion, "bda-gs-0": false, "bda-gs-1": true, - "bda-gs-2": false, + "bda-gs-2": true, "bda-gs-3": false, "bda-gs-4": false, "bda-es-0": true, - "bda-es-1": false, + "bda-es-1": true, "bda-es-2": false, "bda-es-3": false, "bda-es-4": false, @@ -113,7 +113,7 @@ var bdchangelog = { }, "femotes": { "title": "Favorite Emotes!", - "test": "Favorite emotes right click now always works!", + "text": "Favorite emotes right click now always works!", "img": "" }, "pservers": { @@ -145,6 +145,7 @@ Core.prototype.init = function() { var self = this; if(version < supportedVersion) { + $("body").append("
"); alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from betterdiscord.net"); return; } @@ -361,6 +362,21 @@ Core.prototype.constructChangelog = function() { return changeLog; }; +Core.prototype.alert = function(title, text) { + $("body").append('' + + '
' + + '
' + + ' '+title+'' + + '
×
' + + '
' + + '
' + + '
' + + '
'+text+'
' + + '
' + + '
' + + '
'); +}; + /* BetterDiscordApp EmoteModule JavaScript * Version: 1.5 * Author: Jiiks | http://jiiks.net @@ -561,7 +577,7 @@ EmoteModule.prototype.autoCapitalize = function() { var lastWord = text.split(" ").pop(); if(lastWord.length > 3) { var ret = self.capitalize(lastWord.toLowerCase()); - if(ret != null) { + if(ret !== null && ret !== undefined) { $(".channel-textarea-inner textarea").val(text.replace(lastWord, ret)); } } @@ -929,7 +945,6 @@ QuickEmoteMenu.prototype.updateFavorites = function() { ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote); }); icon.off("contextmenu").on("contextmenu", function(e) { - console.log("IT'S HAPPENING!"); var title = $(this).attr("title"); var menu = $("#rmenu"); menu.find("a").off("click").on("click",function() {