diff options
author | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
commit | 6c70c8bf28c2239d29f3abecc8a7ea59b2860bab (patch) | |
tree | c506b28bc82f74072f324d920105737726d5ecaf /js/document/html-document.js | |
parent | 015df99dff8306f8839affd22cdd7689eb00e180 (diff) | |
parent | 24d1873302b2fffc25d254e15e8aa36f59eedb88 (diff) | |
download | ninja-6c70c8bf28c2239d29f3abecc8a7ea59b2860bab.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-x | js/document/html-document.js | 78 |
1 files changed, 1 insertions, 77 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 68c2a9fb..bcf2b5c2 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -454,55 +454,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
454 | } | 454 | } |
455 | }, | 455 | }, |
456 | 456 | ||
457 | /** | ||
458 | * Return the specified inline attribute from the element. | ||
459 | */ | ||
460 | GetElementAttribute: { | ||
461 | value: function(element, attribute) { | ||
462 | |||
463 | var value; | ||
464 | |||
465 | if(attribute === "src") { | ||
466 | return element[attribute].replace(window.location.href, ''); | ||
467 | } | ||
468 | |||
469 | value = element[attribute]; | ||
470 | |||
471 | if(value !== undefined) return value; | ||
472 | // if(value || value === false) return [value, "inline"]; | ||
473 | |||
474 | // 3. | ||
475 | //value = this._document.defaultView.getComputedStyle(element,null).getPropertyValue(attribute); | ||
476 | //if(value) return value; | ||
477 | |||
478 | return null; | ||
479 | } | ||
480 | }, | ||
481 | |||
482 | GetElementStyle: { | ||
483 | value: function(element, style) { | ||
484 | // return this._queryStylesheets(element, style); | ||
485 | } | ||
486 | }, | ||
487 | |||
488 | SetStyle: { | ||
489 | value: function(type, selector, style, value) { | ||
490 | try { | ||
491 | for(var j=0; j<this._stylesheets.length;j++){ | ||
492 | for(var i=0; i<this._stylesheets[j].cssRules.length;i++) { | ||
493 | if(this._stylesheets[j].cssRules[i].selectorText === type + selector) { | ||
494 | this._stylesheets[j].cssRules[i].style[style] = value; | ||
495 | |||
496 | return true; | ||
497 | } | ||
498 | } | ||
499 | } | ||
500 | } catch(err) { | ||
501 | console.log("Cannot change the style of selector: " + selector + " " + err); | ||
502 | } | ||
503 | } | ||
504 | }, | ||
505 | |||
506 | GetElementFromPoint: { | 457 | GetElementFromPoint: { |
507 | value: function(x, y) { | 458 | value: function(x, y) { |
508 | return this._window.getElement(x,y); | 459 | return this._window.getElement(x,y); |
@@ -919,32 +870,5 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
919 | //Error | 870 | //Error |
920 | } | 871 | } |
921 | } | 872 | } |
922 | }, | 873 | } |
923 | |||
924 | //////////////////////////////////////////////////////////////////// | ||
925 | restoreAppState:{ | ||
926 | enumerable: false, | ||
927 | value: function () { | ||
928 | this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing; | ||
929 | this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing; | ||
930 | |||
931 | if((this.savedLeftScroll !== null) && (this.savedTopScroll !== null)){ | ||
932 | this.application.ninja.stage._iframeContainer.scrollLeft = this.savedLeftScroll; | ||
933 | this.application.ninja.stage._iframeContainer.scrollTop = this.savedTopScroll; | ||
934 | this.application.ninja.stage.handleScroll(); | ||
935 | } | ||
936 | |||
937 | this.application.ninja.currentSelectedContainer = this.documentRoot; | ||
938 | if(this.selectionModel){ | ||
939 | this.application.ninja.selectedElements = this.selectionModel.slice(0); | ||
940 | } | ||
941 | |||
942 | this.application.ninja.appModel.show3dGrid = this.draw3DGrid; | ||
943 | |||
944 | this.application.ninja.undocontroller.undoQueue = this.undoStack.slice(0); | ||
945 | this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0); | ||
946 | |||
947 | |||
948 | } | ||
949 | } | ||
950 | }); \ No newline at end of file | 874 | }); \ No newline at end of file |