WoWInterface SVN Xcalc

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk
    from Rev 7 to Rev 8
    ↔ Reverse comparison
  •

Rev 7 → Rev 8

xcalc.lua
333,14 → 333,14
if (XCALC_PREVIOUSKEYTYPE=="none" or XCALC_PREVIOUSKEYTYPE=="num" or XCALC_PREVIOUSKEYTYPE=="state") then
if (key == "/" or key == "*" or key == "-" or key == "-" or key == "+" or key == "^") then
 
if (XCALC_PREVIOUSOP~="") then
if (XCALC_PREVIOUSOP~="" and XCALC_PREVIOUSOP ~= "=") then
temp = xcalc_parse(XCALC_RUNNINGTOTAL .. XCALC_PREVIOUSOP .. currText);
currText = xcalc_xcalculate(temp);
end
XCALC_RUNNINGTOTAL = currText;
XCALC_PREVIOUSOP = key;
elseif (key == "=") then
if (XCALC_PREVIOUSOP~="=" and XCALC_PREVIOUSOP~="") then
if XCALC_PREVIOUSOP ~= "=" and XCALC_PREVIOUSOP ~= "" then
temp = xcalc_parse(XCALC_RUNNINGTOTAL .. XCALC_PREVIOUSOP .. currText);
currText = xcalc_xcalculate(temp);
XCALC_RUNNINGTOTAL = currText;
362,7 → 362,7
--Manage Number Inputs
function xcalc_numkey(key)
local currText = XCALC_NUMBERDISPLAY;
 
 
if (XCALC_PREVIOUSKEYTYPE=="none" or XCALC_PREVIOUSKEYTYPE=="num" or XCALC_PREVIOUSKEYTYPE=="state")then
if (key == ".") then
if (string.find(currText, "c") == nil) then