forked from dojo/dojox
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #12119. Replaced toFrac method and convert dojox/calc to basele…
…ss AMD. Removed use of deprecated APIs. !strict git-svn-id: http://svn.dojotoolkit.org/src/dojox/trunk@25910 560b804f-0ae3-0310-86f3-f6aa0a117693
- Loading branch information
Douglas Hays
committed
Jul 27, 2011
1 parent
ee418bf
commit ac544b2
Showing
16 changed files
with
1,655 additions
and
1,576 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,139 +1,154 @@ | ||
| define(["dojo", "dijit/_Templated", "dojox/math/_base", "dijit/dijit", "dijit/form/ComboBox", "dijit/form/SimpleTextarea", "dijit/form/Button", "dojo/data/ItemFileWriteStore"], function(dojo) { | ||
| define([ | ||
| "dojo/_base/declare", | ||
| "dojo/_base/lang", | ||
| "dojo/dom-style", | ||
| "dijit/_WidgetBase", | ||
| "dijit/_WidgetsInTemplateMixin", | ||
| "dijit/_TemplatedMixin", | ||
| "dojox/math/_base", | ||
| "dijit/_base/manager", | ||
| "dojo/text!./templates/FuncGen.html", | ||
| "dojox/calc/_Executor", | ||
| "dijit/form/ComboBox", // template | ||
| "dijit/form/SimpleTextarea", // template | ||
| "dijit/form/Button", // template | ||
| "dijit/form/TextBox" // template | ||
| ], function(declare, lang, domStyle, WidgetBase, WidgetsInTemplateMixin, TemplatedMixin, math, dijit, template, calc){ | ||
|
|
||
| dojo.experimental("dojox.calc.FuncGen"); | ||
| /*===== | ||
| WidgetBase = dijit._WidgetBase; | ||
| WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin; | ||
| TemplatedMixin = dijit._TemplatedMixin; | ||
| =====*/ | ||
| var FuncGen = declare( | ||
| "dojox.calc.FuncGen", | ||
| [WidgetBase, TemplatedMixin, WidgetsInTemplateMixin], | ||
| { | ||
| // summary: | ||
| // The dialog layout for making functions | ||
| // | ||
| templateString: template, | ||
|
|
||
| dojo.declare( | ||
| "dojox.calc.FuncGen", | ||
| [dijit._Widget, dijit._Templated], | ||
| { | ||
| // summary: | ||
| // The dialog layout for making functions | ||
| // | ||
| templateString: dojo.cache("dojox.calc", "templates/FuncGen.html"), | ||
|
|
||
| widgetsInTemplate:true, | ||
|
|
||
| onSelect: function(){ | ||
| // summary | ||
| // if they select something in the name combobox, then change the body and arguments to correspond to the function they selected | ||
| this.reset(); | ||
| }, | ||
| onClear: function(){ | ||
| // summary | ||
| // the clear button in the template calls this | ||
| // clear the name, arguments, and body if the user says yes | ||
| var answer = confirm("Do you want to clear the name, argument, and body text?"); | ||
| if(answer){ | ||
| this.clear(); | ||
| } | ||
| }, | ||
| saveFunction: function(name, args, body){ | ||
| // override me | ||
| }, | ||
| onSaved: function(){ | ||
| // this on save needs to be overriden if you want Executor parsing support | ||
| //console.log("Save was pressed"); | ||
| }, | ||
| clear: function(){ | ||
| // summary | ||
| // clear the name, arguments, and body | ||
| this.textarea.set("value", ""); | ||
| this.args.set("value", ""); | ||
| this.combo.set("value", ""); | ||
| }, | ||
| reset: function(){ | ||
| // summary | ||
| // set the arguments and body to match a function selected if it exists in the function list | ||
| if(this.combo.get("value") in this.functions){ | ||
| this.textarea.set("value", this.functions[this.combo.get("value")].body); | ||
| this.args.set("value", this.functions[this.combo.get("value")].args); | ||
| } | ||
| }, | ||
| onReset: function(){ | ||
| // summary | ||
| // (Reset button on click event) reset the arguments and body to their previously saved state if the user says yes | ||
| //console.log("Reset was pressed"); | ||
| if(this.combo.get("value") in this.functions){ | ||
| var answer = confirm("Do you want to reset this function?"); | ||
| onSelect: function(){ | ||
| // summary | ||
| // if they select something in the name combobox, then change the body and arguments to correspond to the function they selected | ||
| this.reset(); | ||
| }, | ||
| onClear: function(){ | ||
| // summary | ||
| // the clear button in the template calls this | ||
| // clear the name, arguments, and body if the user says yes | ||
| var answer = confirm("Do you want to clear the name, argument, and body text?"); | ||
| if(answer){ | ||
| this.reset(); | ||
| this.status.set("value", "The function has been reset to its last save point."); | ||
| this.clear(); | ||
| } | ||
| } | ||
| }, | ||
| deleteThing: function(item){ | ||
| // summary | ||
| // delete an item in the writestore | ||
| if (this.writeStore.isItem(item)){ | ||
| // delete it | ||
| //console.log("Found item "+item); | ||
| this.writeStore.deleteItem(item); | ||
| this.writeStore.save(); | ||
| }else{ | ||
| //console.log("Unable to locate the item"); | ||
| } | ||
| }, | ||
| deleteFunction: function(name){ | ||
| // override me | ||
| }, | ||
| onDelete: function(){ | ||
| // summary | ||
| // (Delete button on click event) delete a function if the user clicks yes | ||
| }, | ||
| saveFunction: function(name, args, body){ | ||
| // override me | ||
| }, | ||
| onSaved: function(){ | ||
| // this on save needs to be overriden if you want Executor parsing support | ||
| //console.log("Save was pressed"); | ||
| }, | ||
| clear: function(){ | ||
| // summary | ||
| // clear the name, arguments, and body | ||
| this.textarea.set("value", ""); | ||
| this.args.set("value", ""); | ||
| this.combo.set("value", ""); | ||
| }, | ||
| reset: function(){ | ||
| // summary | ||
| // set the arguments and body to match a function selected if it exists in the function list | ||
| if(this.combo.get("value") in this.functions){ | ||
| this.textarea.set("value", this.functions[this.combo.get("value")].body); | ||
| this.args.set("value", this.functions[this.combo.get("value")].args); | ||
| } | ||
| }, | ||
| onReset: function(){ | ||
| // summary | ||
| // (Reset button on click event) reset the arguments and body to their previously saved state if the user says yes | ||
| //console.log("Reset was pressed"); | ||
| if(this.combo.get("value") in this.functions){ | ||
| var answer = confirm("Do you want to reset this function?"); | ||
| if(answer){ | ||
| this.reset(); | ||
| this.status.set("value", "The function has been reset to its last save point."); | ||
| } | ||
| } | ||
| }, | ||
| deleteThing: function(item){ | ||
| // summary | ||
| // delete an item in the writestore | ||
| if(this.writeStore.isItem(item)){ | ||
| // delete it | ||
| //console.log("Found item "+item); | ||
| this.writeStore.deleteItem(item); | ||
| this.writeStore.save(); | ||
| }else{ | ||
| //console.log("Unable to locate the item"); | ||
| } | ||
| }, | ||
| deleteFunction: function(name){ | ||
| // override me | ||
| }, | ||
| onDelete: function(){ | ||
| // summary | ||
| // (Delete button on click event) delete a function if the user clicks yes | ||
|
|
||
| //console.log("Delete was pressed"); | ||
| //console.log("Delete was pressed"); | ||
|
|
||
| var name; | ||
| if((name = this.combo.get("value")) in this.functions){ | ||
| var answer = confirm("Do you want to delete this function?"); | ||
| if(answer){ | ||
| var item = this.combo.item; | ||
| var name; | ||
| if((name = this.combo.get("value")) in this.functions){ | ||
| var answer = confirm("Do you want to delete this function?"); | ||
| if(answer){ | ||
| var item = this.combo.item; | ||
|
|
||
| //this.writeStore.fetchItemByIdentity({identity:name, onItem: this.deleteThing, onError:null}); | ||
| //this.writeStore.fetchItemByIdentity({identity:name, onItem: this.deleteThing, onError:null}); | ||
|
|
||
| this.writeStore.deleteItem(item); | ||
| this.writeStore.save(); | ||
| this.writeStore.deleteItem(item); | ||
| this.writeStore.save(); | ||
|
|
||
| this.deleteFunction(name); | ||
| delete this.functions[name]; | ||
| this.clear(); | ||
| this.deleteFunction(name); | ||
| delete this.functions[name]; | ||
| this.clear(); | ||
| } | ||
| }else{ | ||
| this.status.set("value", "Function cannot be deleted, it isn't saved."); | ||
| } | ||
| }else{ | ||
| this.status.set("value", "Function cannot be deleted, it isn't saved."); | ||
| } | ||
| }, | ||
| readyStatus: function(){ | ||
| // summary | ||
| // set the status in the template to ready | ||
| this.status.set("value", "Ready"); | ||
| }, | ||
| writeStore:null, //the user can save functions to the writestore | ||
| readStore:null, // users cannot edit the read store contents, but they can use them | ||
| functions:null, // use the names to get to the function | ||
| }, | ||
| readyStatus: function(){ | ||
| // summary | ||
| // set the status in the template to ready | ||
| this.status.set("value", "Ready"); | ||
| }, | ||
| writeStore:null, //the user can save functions to the writestore | ||
| readStore:null, // users cannot edit the read store contents, but they can use them | ||
| functions:null, // use the names to get to the function | ||
|
|
||
| /*postCreate: function(){ | ||
| this.functions = []; // use the names to get to the function | ||
| this.writeStore = new dojo.data.ItemFileWriteStore({data: {identifier: 'name', items:[]}}); | ||
| /*postCreate: function(){ | ||
| this.functions = []; // use the names to get to the function | ||
| this.writeStore = new dojo.data.ItemFileWriteStore({data: {identifier: 'name', items:[]}}); | ||
| this.combo.set("store", this.writeStore); | ||
| },*/ | ||
| this.combo.set("store", this.writeStore); | ||
| },*/ | ||
|
|
||
| startup: function(){ | ||
| // summary | ||
| // make sure the parent has a close button if it needs to be able to close | ||
| // link the write store too | ||
| this.combo.set("store", this.writeStore); | ||
| startup: function(){ | ||
| // summary | ||
| // make sure the parent has a close button if it needs to be able to close | ||
| // link the write store too | ||
| this.combo.set("store", this.writeStore); | ||
|
|
||
| this.inherited(arguments);// this is super class startup | ||
| // close is only valid if the parent is a widget with a close function | ||
| var parent = dijit.getEnclosingWidget(this.domNode.parentNode); | ||
| if(parent && typeof parent.close == "function"){ | ||
| this.closeButton.set("onClick", dojo.hitch(parent, 'close')); | ||
| }else{ | ||
| dojo.style(this.closeButton.domNode, "display", "none"); // hide the button | ||
| this.inherited(arguments);// this is super class startup | ||
| // close is only valid if the parent is a widget with a close function | ||
| var parent = dijit.getEnclosingWidget(this.domNode.parentNode); | ||
| if(parent && typeof parent.close == "function"){ | ||
| this.closeButton.set("onClick", lang.hitch(parent, 'close')); | ||
| }else{ | ||
| domStyle.style(this.closeButton.domNode, "display", "none"); // hide the button | ||
| } | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| }); | ||
|
|
||
| return dojox.calc.FuncGen; | ||
| return lang.mixin(calc, { FuncGen: FuncGen }); | ||
| }); |
Oops, something went wrong.