Browse Source

Merge branch 'master' into develop

version-14
Nabin Hait 8 years ago
parent
commit
dbc122f223
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/public/js/frappe/ui/tree.js

+ 1
- 1
frappe/__init__.py View File

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template

__version__ = '7.1.25'
__version__ = '7.1.26'
__title__ = "Frappe Framework"

local = Local()


+ 1
- 1
frappe/public/js/frappe/ui/tree.js View File

@@ -84,7 +84,7 @@ frappe.ui.TreeNode = Class.extend({
$(icon_html + ' <a class="tree-label grey h6">' + this.get_label() + "</a>").
appendTo(this.$a);

this.$a.find('i').click(function() {
this.$a.find('i, a').click(function() {
setTimeout(function() { me.toolbar.find(".btn-expand").click(); }, 100);
});
},


Loading…
Cancel
Save