提交 ecc932f5 编写于 作者: C Catouse

* updated messager: added noConflict funtion.

上级 078189cb
......@@ -4375,7 +4375,12 @@
};
$.Messager = Messager;
if(!window.Messager) window.Messager = Messager;
var noConflictMessager = window.Messager;
window.Messager = $.Messager;
window.Messager.noConflict = function()
{
window.Messager = noConflictMessager;
};
$.showMessage = function(message, options)
{
......@@ -4426,7 +4431,12 @@
}
};
if(!window.messager) window.messager = $.messager;
var noConflict = window.messager;
window.messager = $.messager;
window.messager.noConflict = function()
{
window.messager = noConflict;
};
}(jQuery, window));
/* ========================================================================
......
此差异已折叠。
......@@ -260,7 +260,7 @@ $(function()
},
drop: function(event)
{
messager.show('真棒!');
window.messager.show('真棒!');
$('.droppable-target').removeClass('panel-success').removeClass('panel-warning');
if(event.target)
{
......
......@@ -4375,7 +4375,12 @@
};
$.Messager = Messager;
if(!window.Messager) window.Messager = Messager;
var noConflictMessager = window.Messager;
window.Messager = $.Messager;
window.Messager.noConflict = function()
{
window.Messager = noConflictMessager;
};
$.showMessage = function(message, options)
{
......@@ -4426,7 +4431,12 @@
}
};
if(!window.messager) window.messager = $.messager;
var noConflict = window.messager;
window.messager = $.messager;
window.messager.noConflict = function()
{
window.messager = noConflict;
};
}(jQuery, window));
/* ========================================================================
......@@ -7472,3 +7482,183 @@
$.fn.calendar.Constructor = Calendar;
}(jQuery, window));
/* ========================================================================
* jQuery Hotkeys Plugin
* Based upon the plugin by Tzury Bar Yochay:
* http://github.com/tzuryby/hotkeys
* ========================================================================
* Copyright 2010, John Resig
* Dual licensed under the MIT or GPL Version 2 licenses.
* Original idea by:
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
* ======================================================================== */
(function(jQuery){
jQuery.hotkeys = {
version: "0.8",
specialKeys:
{
8: "backspace",
9: "tab",
13: "return",
16: "shift",
17: "ctrl",
18: "alt",
19: "pause",
20: "capslock",
27: "esc",
32: "space",
33: "pageup",
34: "pagedown",
35: "end",
36: "home",
37: "left",
38: "up",
39: "right",
40: "down",
45: "insert",
46: "del",
96: "0",
97: "1",
98: "2",
99: "3",
100: "4",
101: "5",
102: "6",
103: "7",
104: "8",
105: "9",
106: "*",
107: "+",
109: "-",
110: ".",
111: "/",
112: "f1",
113: "f2",
114: "f3",
115: "f4",
116: "f5",
117: "f6",
118: "f7",
119: "f8",
120: "f9",
121: "f10",
122: "f11",
123: "f12",
144: "numlock",
145: "scroll",
191: "/",
224: "meta"
},
shiftNums:
{
"`": "~",
"1": "!",
"2": "@",
"3": "#",
"4": "$",
"5": "%",
"6": "^",
"7": "&",
"8": "*",
"9": "(",
"0": ")",
"-": "_",
"=": "+",
";": ": ",
"'": "\"",
",": "<",
".": ">",
"/": "?",
"\\": "|"
}
};
function keyHandler(handleObj)
{
// Only care when a possible input has been specified
if (typeof handleObj.data !== "string")
{
return;
}
var origHandler = handleObj.handler,
keys = handleObj.data.toLowerCase().split(" ");
handleObj.handler = function(event)
{
// Don't fire in text-accepting inputs that we didn't directly bind to
if (this !== event.target && (/textarea|select/i.test(event.target.nodeName) ||
event.target.type === "text"))
{
return;
}
// Keypress represents characters, not special keys
var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[event.which],
character = String.fromCharCode(event.which).toLowerCase(),
key, modif = "",
possible = {};
// check combinations (alt|ctrl|shift+anything)
if (event.altKey && special !== "alt")
{
modif += "alt+";
}
if (event.ctrlKey && special !== "ctrl")
{
modif += "ctrl+";
}
// TODO: Need to make sure this works consistently across platforms
if (event.metaKey && !event.ctrlKey && special !== "meta")
{
modif += "meta+";
}
if (event.shiftKey && special !== "shift")
{
modif += "shift+";
}
if (special)
{
possible[modif + special] = true;
}
else
{
possible[modif + character] = true;
possible[modif + jQuery.hotkeys.shiftNums[character]] = true;
// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
if (modif === "shift+")
{
possible[jQuery.hotkeys.shiftNums[character]] = true;
}
}
for (var i = 0, l = keys.length; i < l; i++)
{
if (possible[keys[i]])
{
return origHandler.apply(this, arguments);
}
}
};
}
jQuery.each(["keydown", "keyup", "keypress"], function()
{
jQuery.event.special[this] = {
add: keyHandler
};
});
})(jQuery);
此差异已折叠。
......@@ -94,7 +94,12 @@
};
$.Messager = Messager;
if(!window.Messager) window.Messager = Messager;
var noConflictMessager = window.Messager;
window.Messager = $.Messager;
window.Messager.noConflict = function()
{
window.Messager = noConflictMessager;
};
$.showMessage = function(message, options)
{
......@@ -145,5 +150,10 @@
}
};
if(!window.messager) window.messager = $.messager;
var noConflict = window.messager;
window.messager = $.messager;
window.messager.noConflict = function()
{
window.messager = noConflict;
};
}(jQuery, window));
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册