Skip to content

S
solo
Commit 1a2bbdf9 authored by mainlove's avatar mainlove
Browse files
Options

formatter

parent 35aac3d7
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 20 deletions
war/src/main/webapp/js/admin/latkeAdmin.js
View file @ 1a2bbdf9
...@@ -3086,7 +3086,6 @@ admin.pluginList = { ...@@ -3086,7 +3086,6 @@ admin.pluginList = {
success: function(result, textStatus){ success: function(result, textStatus){
$("#tipMsg").text(result.msg); $("#tipMsg").text(result.msg);
<<<<<<< HEAD
$("#PluginSetting").html(result); $("#PluginSetting").html(result);
$("#PluginSetting").dialog({ $("#PluginSetting").dialog({
...@@ -3101,20 +3100,11 @@ admin.pluginList = { ...@@ -3101,20 +3100,11 @@ admin.pluginList = {
$("#pluginSetting").html(result); $("#pluginSetting").html(result);
$("#pluginSetting").dialog("open"); $("#pluginSetting").dialog("open");
<<<<<<< HEAD
======= =======
>>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git >>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
$("#loadMsg").text(""); $(
}
});
}, },
<<<<<<< HEAD
=======
>>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
changeStatus: function (pluginId, status) { changeStatus: function (pluginId, status) {
if (status === "ENABLED") { if (status === "ENABLED") {
status = "DISABLED"; status = "DISABLED";
......
war/src/main/webapp/js/admin/latkeAdmin.min.js
View file @ 1a2bbdf9
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment