diff options
| author | Unknwon <u@gogs.io> | 2015-09-06 06:57:25 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-06 06:57:25 -0400 |
| commit | 24658fcbdd507bd66cd76b6ca96e1ef5e1c15af5 (patch) | |
| tree | 4ef2ec4e48a2732f5ec3d47293f592c676413a53 /public | |
| parent | 705224353b10ea4166ca3dde2ed0044357aae78b (diff) | |
| download | gitea-24658fcbdd507bd66cd76b6ca96e1ef5e1c15af5.tar.gz gitea-24658fcbdd507bd66cd76b6ca96e1ef5e1c15af5.zip | |
#633 dix suburl
Diffstat (limited to 'public')
| -rw-r--r-- | public/config.codekit | 15 | ||||
| -rw-r--r-- | public/js/gogs.js | 6 | ||||
| -rw-r--r-- | public/ng/js/gogs.js | 2 |
3 files changed, 7 insertions, 16 deletions
diff --git a/public/config.codekit b/public/config.codekit index eb1258669d..430de03f2a 100644 --- a/public/config.codekit +++ b/public/config.codekit @@ -606,8 +606,8 @@ }, "\/ng\/js\/gogs.js": { "fileType": 64, - "ignore": 0, - "ignoreWasSetByUser": 0, + "ignore": 1, + "ignoreWasSetByUser": 1, "inputAbbreviatedPath": "\/ng\/js\/gogs.js", "outputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js", "outputPathIsOutsideProject": 0, @@ -670,17 +670,6 @@ "outputStyle": 1, "syntaxCheckerStyle": 1 }, - "\/ng\/js\/min\/gogs-min.js": { - "fileType": 64, - "ignore": 1, - "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js", - "outputAbbreviatedPath": "\/ng\/js\/min\/min\/gogs-min-min.js", - "outputPathIsOutsideProject": 0, - "outputPathIsSetByUser": 0, - "outputStyle": 1, - "syntaxCheckerStyle": 1 - }, "\/ng\/js\/utils\/preview.js": { "fileType": 64, "ignore": 1, diff --git a/public/js/gogs.js b/public/js/gogs.js index 982f976e0b..f8d9de662c 100644 --- a/public/js/gogs.js +++ b/public/js/gogs.js @@ -1,6 +1,7 @@ 'use strict'; var csrf; +var suburl; function initCommentPreviewTab($form) { var $tab_menu = $form.find('.tabular.menu'); @@ -407,6 +408,7 @@ function initWebhook() { $(document).ready(function () { csrf = $('meta[name=_csrf]').attr("content"); + suburl = $('meta[name=_suburl]').attr("content"); // Show exact time $('.time-since').each(function () { @@ -485,9 +487,9 @@ $(document).ready(function () { // Emojify emojify.setConfig({ - img_dir:'/img/emoji' + img_dir: suburl + '/img/emoji' }); - $('.markdown').each(function(){ + $('.emojify').each(function () { emojify.run($(this)[0]); }); diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js index 142c6d660e..e4a0afe9f9 100644 --- a/public/ng/js/gogs.js +++ b/public/ng/js/gogs.js @@ -937,7 +937,7 @@ $(document).ready(function () { homepage(); emojify.setConfig({ - img_dir:'/img/emoji' + img_dir: Gogs.AppSubUrl + '/img/emoji' }); emojify.run(); |